[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [translation/bridgedb] Update translations for bridgedb
commit 0cb98acd6ddfa972e0f73dc3a9cf5f2c562536de
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date: Sat May 17 09:16:28 2014 +0000
Update translations for bridgedb
---
ach/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ady/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
af/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
ak/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
am/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ar/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
arn/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ast/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
az/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
be/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
bg/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
bn/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
bn_IN/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
bo/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
br/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
bs/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
ca/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
cs/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++++++++------
csb/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
cv/LC_MESSAGES/bridgedb.po | 320 ++++++++++++++++++++++++++++-----
cy/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
da/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
de/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
dz/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
el/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
en_GB/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
eo/LC_MESSAGES/bridgedb.po | 334 ++++++++++++++++++++++++++++++++++
es/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++++++++++++++------
es_AR/LC_MESSAGES/bridgedb.po | 318 +++++++++++++++++++++++++++-----
es_CL/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
es_CO/LC_MESSAGES/bridgedb.po | 310 ++++++++++++++++++++++++++++----
es_MX/LC_MESSAGES/bridgedb.po | 314 +++++++++++++++++++++++++++-----
et/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
eu/LC_MESSAGES/bridgedb.po | 339 +++++++++++++++++++++++++++++------
fa/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
fi/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
fil/LC_MESSAGES/bridgedb.po | 310 ++++++++++++++++++++++++++++----
fo/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
fr/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
fr_CA/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
fur/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
fy/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ga/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
gl/LC_MESSAGES/bridgedb.po | 335 ++++++++++++++++++++++++++++------
gu/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
gu_IN/LC_MESSAGES/bridgedb.po | 309 +++++++++++++++++++++++++++----
gun/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ha/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
he/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
hi/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
hr/LC_MESSAGES/bridgedb.po | 318 +++++++++++++++++++++++++++-----
hr_HR/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++++++++------
ht/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
hu/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
hy/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
hy_AM/LC_MESSAGES/bridgedb.po | 310 ++++++++++++++++++++++++++++----
ia/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
id/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
is/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
it/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
ja/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++++++++++------
jv/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ka/LC_MESSAGES/bridgedb.po | 319 +++++++++++++++++++++++++++-----
kk/LC_MESSAGES/bridgedb.po | 314 +++++++++++++++++++++++++++-----
km/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
kn/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
ko/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
ko_KR/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
ku/LC_MESSAGES/bridgedb.po | 309 +++++++++++++++++++++++++++----
kw/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ky/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
lb/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
lg/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ln/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
lo/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
lt/LC_MESSAGES/bridgedb.po | 320 ++++++++++++++++++++++++++++-----
lv/LC_MESSAGES/bridgedb.po | 333 ++++++++++++++++++++++++++++------
mg/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
mi/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
mk/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
ml/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
mn/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
mr/LC_MESSAGES/bridgedb.po | 310 ++++++++++++++++++++++++++++----
ms_MY/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
mt/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
my/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
nah/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
nap/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
nb/LC_MESSAGES/bridgedb.po | 335 ++++++++++++++++++++++++++++------
nds/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
ne/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
nl/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
nl_BE/LC_MESSAGES/bridgedb.po | 310 ++++++++++++++++++++++++++++----
nn/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
nso/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
oc/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
or/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
pa/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
pap/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
pl/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++++++++++++++------
pms/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ps/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
pt/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++++++++++++++------
pt_BR/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
ro/LC_MESSAGES/bridgedb.po | 320 ++++++++++++++++++++++++++++-----
ru/LC_MESSAGES/bridgedb.po | 337 ++++++++++++++++++++++++++++------
ru@petr1708/LC_MESSAGES/bridgedb.po | 310 ++++++++++++++++++++++++++++----
sco/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
si_LK/LC_MESSAGES/bridgedb.po | 335 ++++++++++++++++++++++++++++------
sk/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
sk_SK/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
sl/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
sl_SI/LC_MESSAGES/bridgedb.po | 320 ++++++++++++++++++++++++++++-----
sn/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
so/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
son/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
sq/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
sr/LC_MESSAGES/bridgedb.po | 311 ++++++++++++++++++++++++++++----
sr@latin/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
st/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
su/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
sv/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
sw/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
szl/LC_MESSAGES/bridgedb.po | 309 +++++++++++++++++++++++++++----
ta/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
te/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
te_IN/LC_MESSAGES/bridgedb.po | 311 ++++++++++++++++++++++++++++----
templates/bridgedb.pot | 335 ++++++++++++++++++++++++++++------
tg/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
th/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
ti/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
tk/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
tr/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
uk/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
ur/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
ur_PK/LC_MESSAGES/bridgedb.po | 332 ++++++++++++++++++++++++++++++++++
uz/LC_MESSAGES/bridgedb.po | 318 +++++++++++++++++++++++++++-----
ve/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
vi/LC_MESSAGES/bridgedb.po | 311 ++++++++++++++++++++++++++++----
wa/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
wo/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
zh_CN/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
zh_HK/LC_MESSAGES/bridgedb.po | 314 +++++++++++++++++++++++++++-----
zh_TW/LC_MESSAGES/bridgedb.po | 336 ++++++++++++++++++++++++++++------
zu/LC_MESSAGES/bridgedb.po | 312 +++++++++++++++++++++++++++-----
145 files changed, 41550 insertions(+), 5291 deletions(-)
diff --git a/ach/LC_MESSAGES/bridgedb.po b/ach/LC_MESSAGES/bridgedb.po
index 5185aaf..e66451f 100644
--- a/ach/LC_MESSAGES/bridgedb.po
+++ b/ach/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-12-04 18:10+0000\n"
-"Last-Translator: OpenITP <infol10n@xxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ach\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ady/LC_MESSAGES/bridgedb.po b/ady/LC_MESSAGES/bridgedb.po
index 7af4d6b..90374d0 100644
--- a/ady/LC_MESSAGES/bridgedb.po
+++ b/ady/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-11 21:01+0000\n"
-"Last-Translator: Phoul <colin@xxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ady\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/af/LC_MESSAGES/bridgedb.po b/af/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..c6a9d12
--- /dev/null
+++ b/af/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: af\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ak/LC_MESSAGES/bridgedb.po b/ak/LC_MESSAGES/bridgedb.po
index 4d2c1ec..c34bbdd 100644
--- a/ak/LC_MESSAGES/bridgedb.po
+++ b/ak/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:52+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ak\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/am/LC_MESSAGES/bridgedb.po b/am/LC_MESSAGES/bridgedb.po
index eb5eea6..c476eb6 100644
--- a/am/LC_MESSAGES/bridgedb.po
+++ b/am/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:52+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: am\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index 04de09a..1b43f3e 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Ahmad Gharbeia <gharbeia@xxxxxxxxx>, 2014
# allamiro <allamiro@xxxxxxxxx>, 2011
# Ù?ØÙ?د اÙ?ØرÙ?اÙ? <malham1@xxxxxxxxx>, 2011
@@ -13,10 +12,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-29 23:40+0000\n"
-"Last-Translator: Ahmad Gharbeia <gharbeia@xxxxxxxxx>\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"
+"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"
@@ -25,82 +24,315 @@ msgstr ""
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Ù?ا Ù?Ù? اÙ?جسÙ?رØ?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ù?رØÙ?ات اÙ?جسر %s Ù?Ù? Ù?رØÙ?ات Ù?تÙ?ر تساعد Ù?Ù? تخطÙ?Ù? اÙ?رÙ?ابة."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ø£Øتاج Ø¥Ù?Ù? Ù?سÙ?Ù?Ø© بدÙ?Ù?Ø© Ù?Ù?عرÙ?Ø© اÙ?جسÙ?ر!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ù?Ù?Ù?Ù? Ø¥Ù?جاد عÙ?اÙ?Ù?Ù? اÙ?جسÙ?ر اÙ?عاÙ?Ø© بإرساÙ? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? (Ù?Ù? عÙ?Ù?اÙ? %s Ø£Ù? %s ) Ø¥Ù?Ù? %s Ù?ØÙ?Ù? اÙ?سطر 'get bridges' Ù?Ù? Ù?تÙ? اÙ?رساÙ?Ø©."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "اÙ?جسÙ?ر Ù?ا تعÙ?Ù?! Ø£Ù?ا بØاجة Ø¥Ù?Ù? Ù?ساعدة!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "إذا Ù?Ù? Ù?عÙ?Ù? تÙ?ر بÙ?Ø¬Ø§Ø Ù?عÙ? Ù?اÙ?تب رساÙ?Ø© Ø¥Ù?Ù? %s. ØاÙ?Ù? تضÙ?Ù?Ù? اÙ?رساÙ?Ø© Ù?عÙ?Ù?Ù?ات Ù?اÙ?Ù?Ø© عÙ? ØاÙ?تÙ?Ø? بÙ?ا Ù?Ù? Ø°Ù?Ù? اÙ?جسÙ?ر اÙ?تÙ? استخدÙ?تÙ?اØ? Ù? اسÙ? Ù? رÙ?Ù? إصدارة ØزÙ?Ø© تÙ?ر اÙ?تÙ? استخدÙ?تÙ?اØ? Ù? اÙ?رسائÙ? اÙ?تÙ? أظÙ?رÙ?ا Ù?Ù? تÙ?ر عÙ?د تشغÙ?Ù?Ù?Ø? Ø¥Ù?Ø®..."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Ù?استخداÙ? اÙ?أسطر أعÙ?اÙ?Ø? اذÙ?ب Ø¥Ù?Ù? إعدادات اÙ?شبÙ?Ø© اÙ?خاصة بڤÙ?داÙ?Ù?ا Ø«Ù? أشر Ø£Ù?اÙ? \"Ù?Ù?دÙ?Ù? خدÙ?Ø© اÙ?Ø¥Ù?ترÙ?ت Ù?Ù? Ù?Øجب اتصاÙ?ات تÙ?ر\". Ø«Ù? أضÙ? عÙ?اÙ?Ù?Ù? اÙ?جسÙ?ر Ù?اØدا تÙ?Ù? اÙ?آخر."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ù?ا تÙ?جد جسÙ?ر Ù?تاØØ© ØاÙ?Ù?ا"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "ØدÙ?Ø« اÙ?Ù?تصÙ?Ø Ø§Ù?Ø°Ù? تستخدÙ?Ù? Ø¥Ù?Ù? Ù?Ù?Ù?Ù?رÙ?Ù?Ù?س"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "أدخÙ? اÙ?Ù?Ù?Ù?تÙ?Ù?"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "خطÙ?Ø© 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "اØصÙ? عÙ?Ù? %s ØزÙ?Ø© Ù?تصÙ?Ø ØªÙ?ر %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "خطÙ?Ø© 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "اØصÙ? عÙ?Ù? بÙ?اÙ?ات %s اÙ?جسÙ?ر %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "خطÙ?Ø© 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Ø«Ù? %s أدخÙ? بÙ?اÙ?ات اÙ?جسÙ?ر Ù?Ù? تÙ?ر %s "
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/arn/LC_MESSAGES/bridgedb.po b/arn/LC_MESSAGES/bridgedb.po
index 0c8a785..5af6d86 100644
--- a/arn/LC_MESSAGES/bridgedb.po
+++ b/arn/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:44+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: arn\n"
"Plural-Forms: nplurals=2; plural=n > 1;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ast/LC_MESSAGES/bridgedb.po b/ast/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..62b5a5d
--- /dev/null
+++ b/ast/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: ast\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/az/LC_MESSAGES/bridgedb.po b/az/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..4ac93b0
--- /dev/null
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: az\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po
index d358249..c35e4c0 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:54+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: be\n"
"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..c6a622a
--- /dev/null
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: bg\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index 342fa3e..1a90624 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:54+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/bn_IN/LC_MESSAGES/bridgedb.po b/bn_IN/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..f7b4e24
--- /dev/null
+++ b/bn_IN/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: bn_IN\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/bo/LC_MESSAGES/bridgedb.po b/bo/LC_MESSAGES/bridgedb.po
index 87f650b..180b59a 100644
--- a/bo/LC_MESSAGES/bridgedb.po
+++ b/bo/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:55+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: bo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/br/LC_MESSAGES/bridgedb.po b/br/LC_MESSAGES/bridgedb.po
index 5ceb2f9..f846390 100644
--- a/br/LC_MESSAGES/bridgedb.po
+++ b/br/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Fulup <fulup.jakez@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-13 16:31+0000\n"
-"Last-Translator: Fulup <fulup.jakez@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: br\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Petra eo ar pontoù ?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/bs/LC_MESSAGES/bridgedb.po b/bs/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..114b9ee
--- /dev/null
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: bs\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po
index ee74f59..3e513b7 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Illenc <provisionalib@xxxxxxxxxxx>, 2013
# 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\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-10-27 08:40+0000\n"
-"Last-Translator: Illenc <provisionalib@xxxxxxxxxxx>\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Què són els ponts?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s mecanismes Pont %s són mecanismes Tor per esquivar la censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Necessit una manera alternativa d'obtenir ponts"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Una altra manera de trobar adreces de ponts públics és enviant un correu (de %s o %s address) a %s amb el text 'get bridges' al cos del correu."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "No em funcionen els ponts! Ajuda!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Si no us funciona Tor, envieu un correu %s. Hi heu d'incloure el mà xim d'informació sobre el vostre cas: amb la llista de ponts que teniu, la versió, el missatge que Tor us dóna, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Per a usar l'anterior lÃnia, aneu a la configuració de Xarxa Vidalia, clicau a \"El meu proveïdor bloca les connexions Tor\" Després afegiu les adreces de pont una per una."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "No hi ha ponts disponibles"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualitza el navegador a Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Escriviu les dues paraules"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Passa 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Descarrega %s el navegador Tor Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Passa 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Descarrega %s ponts %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Passa 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Ara %s afegeix els ponts a Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 112d143..877604a 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -1,20 +1,19 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# adamse <adamslovacek@xxxxxxxxx>, 2013
# Elisa <valhalla@xxxxxxxxxxxxx>, 2011
# Sanky <gsanky+transifex@xxxxxxxxx>, 2011
-# Radog <bensch.radek@xxxxxxxxx>, 2013
+# Radog <inactive+Radog@xxxxxxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-10-26 11:20+0000\n"
-"Last-Translator: Radog <bensch.radek@xxxxxxxxx>\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"
+"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"
@@ -23,82 +22,315 @@ msgstr ""
"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Co jsou mosty?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays % jsou Tor relé které pomáhajà obejÃt cenzuru."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Chci mosty zjistit jiným způsobem!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "DalÅ¡Ã cesta k nalezenà veÅ?ejných adres mostů je poslánÃm emailem (od %s nebo %s adresy) %s s textem 'get bridges' v tÄ?le mailu."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mé mosty nefungujÃ. PotÅ?ebuji pomoc!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Jestliže Váš Tor nefunguje, napiÅ¡te email %s. Pokuste se zahrnout co nejvÃce informacà o VaÅ¡em pÅ?Ãpadu, napiÅ¡te seznam mostů, které použÃváte, název balÃku/verze kterou použÃváte a zprávy které Vám Tor vypisuje, atd."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Å?ádky nahoÅ?e použÃjte ve programu Vidalia, nastavenà sÃtÄ?. KlepnÄ?te na \"Můj poskytovatel blokuje pÅ?ipojenà pÅ?es sÃÅ¥ TOR\". Poté na každý Å?ádek vložte právÄ? jednu adresu mostu."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Žádné dostupné mosty"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Aktualizujte svůj Firefox prohližeÄ?"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "VepiÅ¡te dvÄ? slova"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Krok 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "ZÃskej %s balÃk Tor prohlÞeÄ?e %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Krok 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ZÃskej %s mosty %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Krok 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Nynà %s pÅ?idej mosty do Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/csb/LC_MESSAGES/bridgedb.po b/csb/LC_MESSAGES/bridgedb.po
index fd1604c..6ed0972 100644
--- a/csb/LC_MESSAGES/bridgedb.po
+++ b/csb/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:53+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: csb\n"
"Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/cv/LC_MESSAGES/bridgedb.po b/cv/LC_MESSAGES/bridgedb.po
index 8b9d3b0..678ffd2 100644
--- a/cv/LC_MESSAGES/bridgedb.po
+++ b/cv/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Ð?има <rastamaf@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-24 04:40+0000\n"
-"Last-Translator: Ð?има <rastamaf@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: cv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Ð?Ä?нле кÄ?пеÑ?Ñ?ем?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?ана Ñ?Ñ?Ä?Ñ? çÑ?л кÄ?пеÑ? Ñ?Ä?Ñ?екÄ?Ñ?ем киÑ?лÄ?!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:114
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Ð?ккÄ? Ñ?Ä?маÑ? çÑ?Ñ?"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1 УÑ?Ä?м"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2 УÑ?Ä?м"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3 УÑ?Ä?м"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/cy/LC_MESSAGES/bridgedb.po b/cy/LC_MESSAGES/bridgedb.po
index b209bf3..1cd20e9 100644
--- a/cy/LC_MESSAGES/bridgedb.po
+++ b/cy/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# huwwaters <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\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-26 08:20+0000\n"
-"Last-Translator: littlegreykida <theinfinitygap@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +20,315 @@ msgstr ""
"Language: cy\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n != 8 && n != 11) ? 2 : 3;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Beth yw pontydd?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Pontydd gyfnewid %s yw'r gyfnewidiau Tor sy'n helpu chithau i osgoi sensoriaeth."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Rwyf yn angen ffordd arall i cael gafael ar pontydd!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ffordd arall i canfod cyfeiriadau pontydd cyhoeddys yw i anfon e-bost (o %s neu gyfeiriad %s) i %s gyda'r llinell 'get bridges' ar ei ben ei hyn o fewn corff yr e-bost."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Nid yw fy mhontydd yn gweithio! Rwyf yn angen help!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Os nad yw'ch Tor yn gweithio, dylech e-bostio %s. Ceisiwch cynnwys cymaint o gwybodaith ag y bo modd, yn cynnwys yr rhestr o pontydd rydych wedi defnyddio, enw'r pecyn a defnyddwyd, yr negeseuon a rhoddwyd allan gan Tor, ayyb."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "I defnyddio'r llinellau uwchben, cer i tydalen osodiadau Vidalia's Network, ac pwyswch \"Mae fy ISP yn wahardd cysylltiadau i'r rhwydwaith Tor.\" Wedyn, ychwanegwch pob gyfeiriad pont, un ar amser."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Nid oes pontydd ar gael"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Diweddarwch eich porwr i Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Teipiwch y ddau air"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Cam 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Cael gafael ar y %s Pecyn Porwr Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Cam 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Cael gafael ar %s pontydd %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Cam 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Nawr %s ychwanegwch y pontydd i Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po
index 534c8dc..5183020 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# OliverMller <theoliver@xxxxxxxxxx>, 2011
# torebjornson <tore.bjornson@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-30 06:20+0000\n"
-"Last-Translator: torebjornson <tore.bjornson@xxxxxxxxx>\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Hvad er broer?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bro relæer %s er Tor relæer der hjælper Dem med at undgå censur."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Jeg har brug for en alternativ metode til at få broer på!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "En anden måde at finde offentlige bro adresser på, er at sende en email (fra en %s eller en %s adresse) til %s kun indeholdende linjen 'få broer' i selve mailen."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mine broer virker ikke! Jeg har brug for hjælp!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Hvis dine Tor broer ikke virker, så email %s. Inkludér venligst mest mulig information om Deres sag, f.eks. hvilke broer De har brugt, versionsnummereret på den software bundle De bruger og eventuelle beskeder som Tor gav."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "For at bruge ovenstående linjer, gå da til Vidalias netværksindstillinger side, og klik på \"Min Internet Udbyder blokerer forbindelse til Tor netværket\". Tilføj efterfølgende hver enkelt bro én ad gangen."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ingen broer er tilgængelige."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Opgrader Deres Firefox browser"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Indtast de to ord"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Første skridt"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "FÃ¥ %s Tor Browser Bundlen %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Andet skridt"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "FÃ¥ %s broer %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Tredje skridt"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Addér nu %s broer til Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po
index c5b95dd..003d3b4 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -1,19 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Locke <locke@xxxxxxxxxxxxxx>, 2011
# to_ba, 2013
# to_ba, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-30 14:10+0000\n"
-"Last-Translator: to_ba\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"
+"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"
@@ -22,82 +21,315 @@ msgstr ""
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Was sind Brücken?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Brückenrelais %s sind Tor-Relais, die Ihnen helfen, die Zensur zu umgehen."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ich brauche einen alternativen Weg, um Brücken zu erhalten!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ein anderer Weg um öffentliche Brückenadressen zu finden, ist es, eine E-Mail (von einer %s oder %s E-Mail-Adresse) mit dem Inhalt »get bridges«, an %s zu schicken."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Meine Brücken funktionieren nicht! Ich brauche Hilfe!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Wenn Ihr Tor nicht funktioniert, sollten Sie eine E-Mail an %s schicken. Schreiben Sie so viele Informationen wie möglich in diese Nachricht, wie z.B. die Brücken die Sie benutzt haben, die verwendete Tor-Version, die Fehlermeldung die Tor ausgibt usw."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Um die obere Zeilen zu benutzen, gehen Sie bitte in die Netzwerkeinstellungen von Vidalia und klicken Sie auf »Mein Internetanbieter blockiert Verbindungen zum Tor-Netzwerk«. Fügen Sie dann die Brückenadressen eine nach der anderen hinzu."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Derzeit sind keine Brücken vorhanden"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Aktualisieren Sie Ihren Browser auf Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Die beiden Wörter eingeben"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Erstens"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Das %s Tor-Browser-Paket %s holen"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Zweitens"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Bridges %s holen"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Drittens"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Jetzt, %s die Brücken zu Tor hinzufügen %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/dz/LC_MESSAGES/bridgedb.po b/dz/LC_MESSAGES/bridgedb.po
index 519e347..a7428b8 100644
--- a/dz/LC_MESSAGES/bridgedb.po
+++ b/dz/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:56+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: dz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po
index d9f041d..40d492e 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# pappasadrian <pappasadrian@xxxxxxxxx>, 2014
# kotkotkot <kotakota@xxxxxxxxx>, 2013
# kotkotkot <kotakota@xxxxxxxxx>, 2012
@@ -12,10 +11,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-04-30 08:52+0000\n"
-"Last-Translator: pappasadrian <pappasadrian@xxxxxxxxx>\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"
+"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"
@@ -24,82 +23,315 @@ msgstr ""
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Τι είναι οι γÎÏ?Ï?Ï?εÏ?;"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Î?ÎÏ?Ï?Ï?eÏ? Ï?ελΠ%s είναι Tor Ï?ελΠÏ?οÏ? Ï?αÏ? βοηθοÏ?ν να Ï?αÏ?ακάμÏ?εÏ?ε Ï?ην λογοκÏ?ιÏ?ία."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "ΧÏ?ειάζομαι Îναν εναλλακÏ?ικÏ? Ï?Ï?Ï?Ï?ο για Ï?Ï?ηÏ?ιμοÏ?οιηÏ?η γÎÏ?Ï?Ï?Ï?ν! "
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Î?ναÏ? άλλοÏ? Ï?Ï?Ï?Ï?οÏ? για να βÏ?είÏ?ε δημÏ?Ï?ιεÏ? διεÏ?θÏ?νÏ?ειÏ? γÎÏ?Ï?Ï?Ï?ν είναι να Ï?Ï?είλεÏ?ε Îνα email (αÏ?Ï? %s ή Ï?Ï?ην διεÏ?θÏ?νÏ?η ενÏ?Ï? %s) Ï?Ï?ο %s με Ï?ον Ï?ιÏ?λο «Ï?Ï?ηÏ?ιμοÏ?οιηÏ?η γÎÏ?Ï?Ï?Ï?ν» αÏ?Ï? μÏ?νη Ï?ηÏ? Ï?Ï?ο Ï?Ï?μα Ï?οÏ? μηνÏ?μαÏ?οÏ?."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Î?ι γÎÏ?Ï?Ï?εÏ? μοÏ? δεν λειÏ?οÏ?Ï?γοÏ?ν! ΧÏ?ειάζομαι βοήθεια! "
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Î?ν Tor Ï?αÏ? δεν λειÏ?οÏ?Ï?γεί, θα Ï?Ï?ÎÏ?ει να Ï?Ï?είλεÏ?ε ενα email %s. Î Ï?οÏ?Ï?αθήÏ?Ï?ε να Ï?Ï?μÏ?εÏ?ιλάβεÏ?ε Ï?Ï?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ? Ï?Ï?εÏ?ικά με Ï?ην Ï?Ï?Ï?θεÏ?ή Ï?αÏ? μÏ?οÏ?είÏ?ε, Ï?Ï?μÏ?εÏ?ιλαμβανομÎνοÏ? Ï?οÏ? καÏ?αλÏ?γοÏ? Ï?Ï?ν γεÏ?Ï?Ï?Ï?ν Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιείÏ?αι, Ï?ο Ï?νομα Ï?οÏ? αÏ?Ï?είοÏ? δÎÏ?μηÏ?/ÎκδοÏ?η Ï?οÏ? Ï?Ï?ηÏ?ιμοÏ?οιήθηκε, Ï?α μηνÏ?μαÏ?α Ï?οÏ? Ï?ο Tor εμÏ?ανιÏ?ε, κλÏ?. "
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Î?ια να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε Ï?ιÏ? Ï?αÏ?αÏ?άνÏ? γÏ?αμμÎÏ?, Ï?ήγαινεÏ?ε Ï?Ï?ην Ï?ελίδα Î?ικÏ?Ï?ακÎÏ? ΡÏ?θμίÏ?ειÏ? Ï?οÏ? Vidalia και κάνÏ?ε κλικ Ï?Ï?ο \"Î? ISP μοÏ? μÏ?λοκάÏ?ει Ï?ιÏ? Ï?Ï?νδÎÏ?ειÏ? Ï?Ï?ο δίκÏ?Ï?ο Ï?οÏ? Tor\". Î?κεί Ï?Ï?οÏ?θÎÏ?Ï?ε Ï?ην διεÏ?θÏ?νÏ?η κάθε γÎÏ?Ï?Ï?αÏ?, μία ανά γÏ?αμμή."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Î?Îν Ï?Ï?άÏ?Ï?ει καμία γÎÏ?Ï?Ï?α διαθÎÏ?ιμη αÏ?Ï?ή Ï?η Ï?Ï?ιγμή"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Î?ναβαθμίÏ?Ï?ε Ï?ο Ï?Ï?Ï?γÏ?αμμα Ï?εÏ?ιήγηÏ?ήÏ? Ï?αÏ? Ï?Ï?ο Firefox "
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "ΠληκÏ?Ï?ολογήÏ?Ï?ε Ï?ιÏ? δÏ?ο λÎξειÏ? "
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Î?ημα 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "ΠαÏ?Ï?ε Ï?ο %s ΠακÎÏ?ο ΠεÏ?ιηγηÏ?ήÏ? Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Î?ημα 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ΠαÏ?Ï?ε Ï?ιÏ? %s γεÏ?Ï?Ï?εÏ? %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Î?ημα 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ΤÏ?Ï?α %s Ï?Ï?ηÏ?ιμοÏ?οιηÏ?Ï?ε Ï?ιÏ? γεÏ?Ï?Ï?εÏ? Ï?Ï?ο Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 1e7d329..367a9ad 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# richardshaylor <rshaylor@xxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-21 22:00+0000\n"
-"Last-Translator: richardshaylor <rshaylor@xxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "What are bridges?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "I need an alternative way of getting bridges!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Another way to find public bridge addresses is to send an email (from a %s or a %s address) to %s with the line 'get bridges' by itself in the body of the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "My bridges don't work! I need help!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "If your Tor doesn't work, you should email %s. Try including as much info about your case as you can, including the list of bridges you used, the bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "To use the above lines, go to Vidalia's Network settings page, and click \"My ISP blocks connections to the Tor network\". Then add each bridge address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "No bridges currently available"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Type the two words"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Step 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Get %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Now %s add the bridges to Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/eo/LC_MESSAGES/bridgedb.po b/eo/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..f7632dd
--- /dev/null
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,334 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+# identity, 2012
+# trio <trio@xxxxxxxxxxxxx>, 2011
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: eo\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 014b96d..9f1d984 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -1,19 +1,19 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
# NinjaTuna <nort0ngh0st@xxxxxxxxxxx>, 2011
# Envite <envite@xxxxxxxxxxxxx>, 2013
-# strel <strelnic@xxxxxxxxx>, 2013
-# strel <strelnic@xxxxxxxxx>, 2012
+# strel, 2013
+# strel, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-04-30 21:53+0000\n"
-"Last-Translator: Envite <envite@xxxxxxxxxxxxx>\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"
+"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"
@@ -22,82 +22,315 @@ msgstr ""
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "¿Qué son los puentes ('bridges')?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "Los %s repetidores puente %s ('bridge relays') son un tipo de repetidores Tor que pueden ayudarle a evitar la censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito un modo alternativo de conseguir puentes!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Otra forma de encontrar direcciones de puentes ('bridges') de acceso público es enviar un correo (desde una dirección %s o una %s) a %s con la lÃnea 'get bridges' por si sola en el cuerpo del correo."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Si su Tor no funciona, debe enviar un correo a %s. Intente incluir tanta información acerca de su caso como pueda, incluyendo la lista de puentes ('bridges') que utilizó, el nombre de archivo/versión del paquete que tenÃa instalado, los mensajes que Tor emitió, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para usar las lÃneas anteriores, vaya a la página de Preferencias de red de Vidalia, y haga clic en \"Mi ISP bloquea conexiones a la red Tor\". Añada entonces cada dirección de puente ('bridge'), una cada vez."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "No hay puentes ('bridges') disponibles actualmente."
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualice su navegador a Firefox"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Teclee las dos palabras"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Paso 1"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obtenga el %s Paquete de Navegador Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Paso 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtenga los %s puentes ('bridges') %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Paso 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Ahora %s añada los puentes a Tor %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 91ffc5b..1b2d1b8 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# cametiope <aldohcasa@xxxxxxxxxxx>, 2014
# José Fabián <ar.jfabian+transifex@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-05-14 20:21+0000\n"
-"Last-Translator: cametiope <aldohcasa@xxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +20,315 @@ msgstr ""
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "¿Qué son los puentes de red?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Puentes de retransmisión %s son retransmisiones de Tor que te ayudan a evitar la censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito una manera alternativa de obtener puentes!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Otra manera de encontrar direcciones de puentes publicas es enviar un correo electrónico (desde %s o %s dirección) a %s con la linea 'get bridges' en el cuerpo del correo. "
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "¡Mis puentes no funcionan! Necesito ayuda!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Si tu Tor no funciona, deberas enviar un correo electrónico %s. Intenta incluir la mayor información que puedas acerca de tu situación, incluyendo la lista de los puentes que usas, la version y nombre de archivo del bundle que usas, el mensaje de error que Tor mostro, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/es_CL/LC_MESSAGES/bridgedb.po b/es_CL/LC_MESSAGES/bridgedb.po
index 22727ad..3c0bd03 100644
--- a/es_CL/LC_MESSAGES/bridgedb.po
+++ b/es_CL/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# halbares <pablo.alvarez.flores@xxxxxxxxx>, 2014
# Pablo Lezaeta <prflr88@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-26 19:50+0000\n"
-"Last-Translator: Pablo Lezaeta <prflr88@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +20,315 @@ msgstr ""
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "¿Cuáles son los puentes?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Puentes retrasadores %s son repetidores de Tor que ayudan a combatir la censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito una forma alternativa de obtener puentes!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Otra forma de encontrar direcciones de puentes públicos es mediante enviar un correo electrónico (De %s o %s dirección) a %s con la lÃnea «get bridges» en el cuerpo del mensaje."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "¡Mi puente no funciona! ¡Ayúdenme!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Si Tor no funciona, por favor envÃe un correo %s. Intente incluir toda la información posible, incluyendo la lista de los puentes que ha utilizado, el paquete nombre de archivo/versión que utilizó, los mensajes que Tor devolvió, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para utilizar las lÃneas anteriores, dirÃjase a la página de configuración de la red de VIdalia, y haga clic en «Mi ISP bloquea las conexiones a la red Tor». A continuación, añada cada dirección puente una a una."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "No hay puentes disponibles actualmente"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualiza tu navegador a Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Escribe las dos palabras"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Paso 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obtenga %s Paquete del navegador Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Paso 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtenga %s puentes %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Paso 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Ahora %s añadir los puentes a Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 33b6842..28e7c0c 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-11-01 15:50+0000\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"
"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: es_CO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po
index 5d352e0..70872ae 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# TheFreeman <maurocarrizales@xxxxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-04-29 23:30+0000\n"
-"Last-Translator: TheFreeman <maurocarrizales@xxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualiza tu navegador a Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..813724c
--- /dev/null
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: et\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index e6e956c..c496197 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Antxon Baldarra <baldarra@xxxxxxxxxxx>, 2013
-# Antxon Baldarra <baldarra@xxxxxxxxxxx>, 2011, 2012
+# Antxon Baldarra <baldarra@xxxxxxxxxxxxx>, 2013
+# Antxon Baldarra <baldarra@xxxxxxxxxxxxx>, 2011, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-09 15:19+0000\n"
-"Last-Translator: Antxon Baldarra <baldarra@xxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +20,315 @@ msgstr ""
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Zer dira zubiak?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s zubi erreleak zentsura sahiesten laguntzen zaituzten %s Tor erreleak dira."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Zubi publikoen helbideak aurkitzeko beste modu bat eposta (%s edo %s helbide batetik) bat bidaltzea da %sera 'get bridges' lerroarekin mezuaren gorputzean bertan."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Zure Torek funtzionatzen ez badu, %sera email bat idatzi beharko zenuke. Saiatu zure kasuaren inguruan ahalik eta informazio gehien sartzen, erabili dituzun zubien zerrenda, erabili duzun bundlearen fitxategi izena/bertsioa, Torek eman dizkizun mezuak, eta abar barne."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Gaineko lerroak erabiltzeko, joan zaitez Vidaliaren sare ezarpenenak orrira, eta sakatu \"Nire Internet Zerbitzu Hornitzaileak Tor sarera konektatzea blokeatzen dit\". Ondoren gehitu ezazu zubi helbide bakoitza banan banan."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ez dago zubirik eskuragarri oraintxe bertan."
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Berritu zure nabigatzailea Firefoxera"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Idatzi itzazu bi hitzak"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1. pausua"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Eskuratu %s Tor Browser Bundlea %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2. pausua"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Eskuratu %s zubiak %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3. pausua"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Orain %s gehitu zubiak Torera %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index cc1ee43..ce39511 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# arashaalaei <aalaeiarash@xxxxxxxxx>, 2011
# signal89 <ali.faraji90@xxxxxxxxx>, 2014
# Ardeshir, 2013
@@ -11,10 +10,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-11 13:31+0000\n"
-"Last-Translator: signal89 <ali.faraji90@xxxxxxxxx>\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"
+"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"
@@ -23,82 +22,315 @@ msgstr ""
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Ù¾Ù?â??Ù?ا Ú?Ù? Ù?ستÙ?دØ?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ù¾Ù?â??Ù?ا %s بازپخش Ú©Ù?Ù?دÙ?â??Ù?اÛ?Û? Ù?ستÙ?د Ú©Ù? بÙ? Ø´Ù?ا براÛ? دÙ?ر زدÙ? ساÙ?سÙ?ر Ú©Ù?Ú© Ù?Û?â??Ú©Ù?Ù?د"
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "بÙ? Û?Ú© راÙ? دÛ?گر براÛ? درÛ?اÙ?ت Ù¾Ù?â??Ù?ا اØتÛ?اج دارÙ?!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Û?Ú© راÙ? دÛ?گر براÛ? درÛ?اÙ?ت Ù¾Ù?â??Ù?اÛ? عÙ?Ù?Ù?Û?Ø? Ù?رستادÙ? Û?Ú© اÛ?Ù?Û?Ù? (از آدرسâ??Ù?اÛ? %s Ù? Û?ا %s) بÙ? %s Ù? Ù?رار دادÙ? عبارت 'get bridges' در Ù?تÙ? اÛ?Ù?Û?Ù? است."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "بÙ? Ú©Ù?Ú© اØتÛ?اج دارÙ?! Ù¾Ù?â??Ù?اÛ? Ù?Ù? کار Ù?Ù?Û?â??Ú©Ù?Ù?د!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "اگر \"تÙ?ر\" Ø´Ù?ا کار Ù?Ù?Û?Ú©Ù?دØ? اÛ?Ù?Û?Ù?Û? بÙ? آدرس %s بÙ?رستÛ?د. سعÛ? Ú©Ù?Û?د تا Ø¢Ù?جا Ú©Ù? Ù?Ù?Ú©Ù? است اطÙ?اعات بÛ?شترÛ? راجع بÙ? Ù?Ø´Ú©Ù?تاÙ?Ø? شاÙ?Ù? Ù?Û?ست Ù¾Ù?â??Ù?اØ? Ù?اÙ? Ù? Ù?سخÙ? بستÙ?â??اÛ? Ú©Ù? استÙ?ادÙ? کردÛ?د Ù? Ù¾Û?غاÙ?â??Ù?اÛ? خرÙ?جÛ? تÙ?ر ارائÙ? بدÙ?Û?د."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "براÛ? استÙ?ادÙ? از خطÙ?Ø· باÙ?اØ? بÙ? Ù?سÙ?ت تÙ?ظÛ?Ù?ات شبکÙ?â??Ù? Ù?Û?داÙ?Û?ا رÙ?تÙ? Ù? گزÛ?Ù?Ù? \"سرÙ?Û?س دÙ?Ù?دÙ? اÛ?Ù?ترÙ?ت Ù?Ù? ارتباط با شبکÙ? تÙ?ر را Ù?سدÙ?د کردÙ? است\" را اÙ?تخاب Ú©Ù?Û?د Ù? سپس آدرس Ù¾Ù?â??Ù?ا را Û?Ú©Û? Û?Ú©Û? Ù?ارد Ú©Ù?Û?د."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ù?Û?Ú? Ù¾Ù?Û? درØاÙ? Øاضر Ù?Ù?جÙ?د Ù?Û?ست"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Ù?رÙ?رگر Ø®Ù?د را بÙ? Ù?اÛ?رÙ?اکس ارتÙ?ا دÙ?Û?د"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "دÙ? Ù?اÚ?Ù? زÛ?ر را تاÛ?Ù¾ Ú©Ù?Û?د"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Ù?رØÙ?Ù? Û±"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "درÛ?اÙ?ت %s بستÙ? Ù?رÙ?رگر تÙ?ر %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Ù?رØÙ?Ù? Û²"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "درÛ?اÙ?ت %s Ù¾Ù?â??Ù?ا %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Ù?رØÙ?Ù? Û³"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ØاÙ?ا %s Ù¾Ù?â??Ù?ا را بÙ? تÙ?ر اضاÙ?Ù? Ú©Ù?Û?د %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po
index 356eaa7..994b054 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# karvjorm <karvonen.jorma@xxxxxxxxx>, 2014
# kalossi <ossikallunki@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-02-16 11:50+0000\n"
-"Last-Translator: karvjorm <karvonen.jorma@xxxxxxxxx>\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Mitä ovat sillat?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Siltareitittimet %s ovat Tor-reitittimiä, jotka auttavat sinua kiertämään sensuuria."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Toinen tapa löytää julkinen siltaosoite on lähettää sähköpostiosoite (osoitteesta %s tai %s) osoitteeseen %s rivillä 'get bridges' itse viestin rungossa."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Siltani ei toimi! Tarvitsen apua!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Jos Tor-ohjelmasi ei toimi, sinun pitäisi lähettää sähköpostia osoitteeseen %s. Sisällytä viestiin mahdollisimman paljon tietoa tapauksesta mukaanlukien luettelo käyttämistäsi silloista, käyttämästäsi ohjelmistopaketin tiedostonimestä/versiosta, saamasi Tor-virheilmoitukset, jne."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Yllä olevien rivien käyttämiseksi siirry Vidalia-verkon asetussivulle ja napsauta \"Palvelutarjoajani estää yhteyden Tor-verkkoon\". Lisää sitten jokainen siltaosoite yksi kerrallaan."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Siltoja ei ole tällä hetkellä saatavilla"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Päivitä selaimesi Firefoxiin"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Kirjoita kaksi sanaa"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Vaihe 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Hanki %s Tor-selainpaketti %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Vaihe 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Hanki %s sillat %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Vaihe 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Nyt %s lisää sillat Toriin %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/fil/LC_MESSAGES/bridgedb.po b/fil/LC_MESSAGES/bridgedb.po
index 848c341..475ac39 100644
--- a/fil/LC_MESSAGES/bridgedb.po
+++ b/fil/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-28 22:49+0000\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"
"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: fil\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/fo/LC_MESSAGES/bridgedb.po b/fo/LC_MESSAGES/bridgedb.po
index cafe832..26dcd04 100644
--- a/fo/LC_MESSAGES/bridgedb.po
+++ b/fo/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:56+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: fo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 765bdfb..bf874ca 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# lunar <lunar@xxxxxxxxxxxxxx>, 2013
# Onizuka, 2013
# mehditaileb <mehditaileb@xxxxxxxxxxxxxxxx>, 2011
@@ -11,10 +10,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-11-05 21:20+0000\n"
-"Last-Translator: Onizuka\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"
+"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"
@@ -23,82 +22,315 @@ msgstr ""
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Que sont les bridges ?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Les bridges %s sont des relais Tor qui vous aident à contourner la censure."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Une autre manière de découvrir des adresses de bridge est d'envoyer un email (à partir d'une adresse en %s ou en %s) à %s avec la ligne « get bridges » dans le corps du message."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mes bridges ne fonctionnent pas, j'ai besoin d'aide !"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Si Tor ne fonctionne pas, envoyez un email à %s. Essayez d'inclure autant d'informations que possible concernant votre cas, incluant la liste des bridges que vous avez utilisés, le nom et la version du bundle, les messages que Tor a renvoyé, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Pour utiliser les lignes ci-dessus, allez dans l'onglet Réseau de Vidalia et cochez « Mon FAI bloque les connexions au réseau Tor ». Puis ajoutez une à une les adresses des bridges."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Aucune bridge n'est actuellement disponible."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Changez votre navigateur pour Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Entrez les deux mots"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Ã?tape 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Récupérez le %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Ã?tape 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Récupérez les %s addresses de bridge %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Ã?tape 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Maintenant %s ajoutez les adresses de bridge dans Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po
index 7b665d1..06984ec 100644
--- a/fr_CA/LC_MESSAGES/bridgedb.po
+++ b/fr_CA/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# lunar <lunar@xxxxxxxxxxxxxx>, 2013
# mehditaileb <mehditaileb@xxxxxxxxxxxxxxxx>, 2011
# Onizuka, 2013
@@ -11,10 +10,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-01 21:00+0000\n"
-"Last-Translator: Alain-Olivier Breysse\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"
+"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"
@@ -23,82 +22,315 @@ msgstr ""
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Que sont les ponts?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Les ponts relais %s sont des relais Tor qui vous aident à contourner la censure."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "J'ai besoin d'une alternative pour obtenir des ponts!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Une autre manière de trouver des adresses publiques de pont est d'envoyer un courriel (à partir d'une adresse %s ou %s) à %s avec la ligne « get bridges » seule dans le corps du courriel."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mes ponts ne fonctionnent pas, j'ai besoin d'aide!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Si votre Tor ne fonctionne pas, envoyer un courriel à %s. Essayer d'inclure autant d'informations que possible concernant votre cas, incluant la liste des ponts utilisés, le nom de fichier et la version de l'offre groupée, les messages donnés par Tor, etc..."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Pour utiliser les lignes ci-dessus, aller dans l'onglet des paramètres réseau de Vidalia et cocher « Mon FAI bloque les connexions au réseau Tor ». Puis ajouter les adresses de chaque pont une à la fois."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Aucune pont disponible présentement."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Changer votre navigateur pour Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Taper les deux mots"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Ã?tape 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obtenir %s l'offre groupée de navigation Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Ã?tape 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtenir %s les ponts %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Ã?tape 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Maintenant %s ajouter les ponts à Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/fur/LC_MESSAGES/bridgedb.po b/fur/LC_MESSAGES/bridgedb.po
index 1f2715b..fa4d87d 100644
--- a/fur/LC_MESSAGES/bridgedb.po
+++ b/fur/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:51+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: fur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/fy/LC_MESSAGES/bridgedb.po b/fy/LC_MESSAGES/bridgedb.po
index cbb154b..fa490fd 100644
--- a/fy/LC_MESSAGES/bridgedb.po
+++ b/fy/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:55+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: fy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ga/LC_MESSAGES/bridgedb.po b/ga/LC_MESSAGES/bridgedb.po
index 0653a4e..4cdd4da 100644
--- a/ga/LC_MESSAGES/bridgedb.po
+++ b/ga/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:43+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ga\n"
"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/gl/LC_MESSAGES/bridgedb.po b/gl/LC_MESSAGES/bridgedb.po
index 6aff6d7..8605b7c 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -1,5 +1,5 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
@@ -8,10 +8,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-08 15:33+0000\n"
-"Last-Translator: manuel meixide <m.meixide@xxxxxxxxx>\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"
+"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"
@@ -20,82 +20,315 @@ msgstr ""
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Que son os repetidores ponte?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Repetidores Ponte %s son repetidores Tor que axudan a burlar a censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Eu necesito un xeito alternativo de obter pontes!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Outra forma de atopar os enderezos de pontes públicas é enviar un correo electrónico (desde un %s ou un enderezo %s) para %s coa liña 'get bridges' por si soa no corpo do correo electrónico."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "As miñas pontes non funcionan! Necesito axuda!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Se o Tor non funciona, ten que enviar un correo-e a %s. Probe incluÃr tanta información sobre o seu caso como poida, incluÃndo a lista de pontes que usou, o nome do paquete/versión que usou, as mensaxes que Tor lle deu , etc"
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para usar as liñas máis arriba, ten que ir á páxina de Configuración de rede do Vidalia, e premer en \"O meu ISP bloquea as conexións á rede Tor\". A continuación, engada un enderezo dunha ponte de cada vez."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Non hai pontes actualmente dispoñibles"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualiza o teu navegador a Firefox"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Escriba as dúas palabras"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Paso 1"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obter o %s Paquete Navegador Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Paso 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter as %s pontes %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Paso 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Agora %s engada as pontes a Tor %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/gu/LC_MESSAGES/bridgedb.po b/gu/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..51e37ab
--- /dev/null
+++ b/gu/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/gu_IN/LC_MESSAGES/bridgedb.po b/gu_IN/LC_MESSAGES/bridgedb.po
index 471b648..c8d8300 100644
--- a/gu_IN/LC_MESSAGES/bridgedb.po
+++ b/gu_IN/LC_MESSAGES/bridgedb.po
@@ -1,14 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-21 11:32+0000\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"
"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"
@@ -18,82 +18,315 @@ msgstr ""
"Language: gu_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/gun/LC_MESSAGES/bridgedb.po b/gun/LC_MESSAGES/bridgedb.po
index 5a6e73c..58e743b 100644
--- a/gun/LC_MESSAGES/bridgedb.po
+++ b/gun/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:51+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: gun\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ha/LC_MESSAGES/bridgedb.po b/ha/LC_MESSAGES/bridgedb.po
index 4d74f78..83d7b2f 100644
--- a/ha/LC_MESSAGES/bridgedb.po
+++ b/ha/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:50+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ha\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po
index f700478..21a5410 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# aharonoosh <aharonoosh1@xxxxxxxxx>, 2012
# Elifelet <arab.with.nargila@xxxxxxxxx>, 2014
# GenghisKhan <genghiskhan@xxxxxx>, 2013
@@ -12,10 +11,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-30 12:30+0000\n"
-"Last-Translator: Kunda\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -24,82 +23,315 @@ msgstr ""
"Language: he\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "×?×?×? ×?שר×?×??"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s ×?×?סר×? ×?שר %s ×?×?× ×? ×?×?סר×? Tor ×?שר ×?ס×?×?×¢×?×? ×?×? ×?עק×?×£ ×¦× ×?×?ר×?."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "×?× ×? ×?ק×?ק ×?×?ר×? ×?×?×?פ×?ת ×?ק×?×?ת ×?שר×?×?!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "×?ר×? ×?×?רת ×?×?צ×?×?ת ×?ת×?×?ת ש×? ×?שר פ×?×?×?×? ×?×?× ×? ש×?×?×?ת ×?×?×?×´×? (×?ת×?×? ×?ת×?×?ת %s ×?×? %s) ×?×? %s ×¢×? ×?ש×?ר×? 'get bridges' ×?ש×?עצ×?×? ×?ת×?×? ×?×?×£ ×?×?×?×?×¢×?."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "×?×?שר×?×? ש×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? ×?ק×?ק ×?×¢×?ר×?!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "×?×? Tor ×?×? ×¢×?×?×? ×?צ×?×?, ×¢×?×?×? ×?ש×?×?×? ×?×?×?×´×? ×?×? %s. × ×¡×? ×?×?×?×?×? ×?×?×? ש×?×?תר ×?×?×?×¢ ×?×?×?×?ת ×?×?קר×? ש×?×? ×?×?×? ש×?×?×?×?×?ת×? ×?עש×?ת ×?×?, ×?×?×?×? ×?ת רש×?×?ת ×?×?שר×?×? ×?שר ×?שת×?שת ×?×?, ש×? ×?ק×?×?×¥/×?רס×? ש×? ×?×?×?×?×?×? (bundle) ש×?שת×?שת, ×?×?×?×?×¢×?ת ×?שר Tor ×?סר ×?×?×?׳."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "×?×?×? ×?×?שת×?ש ×?ש×?ר×?ת ×?×¢×?×?, ×?×?ש×? ×?×? ×¢×?×?×? ×?×?×?ר×?ת רשת ×?ת×?×? Vidalia, ×?×?ק×?ק \"ספק ×?×?×?× ×?×¨× ×? ש×?×? ×?×?ס×? ×?×?×?×?ר×?×? ×?רשת Tor\". ×?×?ר×? ×?×? ×?×?סף ×?×? ×?ת×?×?ת ×?שר ×?×?ת ×?×?×? פע×?."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "×?×?×? ×?שר×?×? ×?×?×?× ×?×? ×?עת"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "ש×?ר×? ×?ת ×?×?פ×?פ×? ש×?×? ×?×? Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "×?קש ×?ת שת×? ×?×?×?×?×?×?"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "צע×? 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "×?ש×? ×?ת %s ×?×?×?×?ת ×?×?פ×?פ×? ש×? Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "צע×? 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "×?ש×? %s ×?שר×?×? %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "צע×? 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "×?עת %s ×?×?סף ×?ת ×?×?שר×?×? ×?×? Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..019513e
--- /dev/null
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: hi\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/hr/LC_MESSAGES/bridgedb.po b/hr/LC_MESSAGES/bridgedb.po
index 0d13512..f6e0a41 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# anchorsound <anchorsound@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-14 19:11+0000\n"
-"Last-Translator: anchorsound <anchorsound@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Utipkaj dvije rijeÄ?i"
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Korak 1"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Korak 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po
index b4f04ab..9d9871b 100644
--- a/hr_HR/LC_MESSAGES/bridgedb.po
+++ b/hr_HR/LC_MESSAGES/bridgedb.po
@@ -1,19 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
-# dlb031 <abuljan031@xxxxxxxxx>, 2013
+# dlb031, 2013
# Armando Vega <synaan@xxxxxxxxx>, 2012
# gogo <trebelnik2@xxxxxxxxx>, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-07-31 07:38+0000\n"
-"Last-Translator: dlb031 <abuljan031@xxxxxxxxx>\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"
+"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"
@@ -22,82 +21,315 @@ msgstr ""
"Language: hr_HR\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Å to su mostovi?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Mostni releji %s su Tor releji koji vam pomažu zaobiÄ?i cenzuru."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Trebam alternativni naÄ?in dobivanja mostova!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "JoÅ¡ jedan naÄ?in za pronalazak javnih mostnih adresa je poslati email (sa %s ili %s adrese) da %s samo s reÄ?enicom 'dobiti mostove' u sadržaju maila."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Moji mostovi ne rade! Treba mi pomoÄ?!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ako vaÅ¡ Tor ne radi, poÅ¡aljite email na %s. Probajte ukljuÄ?iti Å¡to viÅ¡e informacija o svom sluÄ?aju, ukljuÄ?ujuÄ?i popis mostova koje ste koristili, bunde ime datoteke/verziju koju ste koristili, poruke koje je slao Tor, itd."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Za korištenje gore navedenih redova, posjetite stranicu Mrežnih Postavki u VIdaliji, te kliknite \"Moj ISP blokira veze prema Tor mreži\". Onda dodajte sve mostne adrese jednu po jednu."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Nema trenutno dostupnih mostova"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Nadogradite vaš preglednik na Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "NapiÅ¡ite ove dvije rijeÄ?i"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Korak 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Dobijte %s Tor PregledniÄ?ki Paket %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Korak 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Dobijte %s mostove %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Korak 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Sad %s dodajte mostove na Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ht/LC_MESSAGES/bridgedb.po b/ht/LC_MESSAGES/bridgedb.po
index b6eab28..884397c 100644
--- a/ht/LC_MESSAGES/bridgedb.po
+++ b/ht/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:46+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ht\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po
index 7fa4bde..bcafeb5 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# vargaviktor <viktor.varga@xxxxxxxxx>, 2013
# vargaviktor <viktor.varga@xxxxxxxxx>, 2011
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-10-01 16:28+0000\n"
-"Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Mik is a Hidak?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s HÃd kapcsolók %s Tor kapcsolók, amelyek a cenzorálás megkerülésére használhatók."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Szükségem van egy alternatÃv módra a Hidak beszerzéséhez!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Másik lehetÅ?ség publikus hidak beszerzésére, ha küld egy emailt (a %s vagy %s cÃmrÅ?l) a %s cÃmree, a 'get bridges' sorral a levél törzsében."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "A HÃdjaim nem működnek! SegÃtségre van szükségem!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ha a Tor nem működik Ãrnia kell a %s cÃmre. Próbáljon meg amennyi információt csak lehet belefoglalni, beleértve a használt hidak listáját is, a csomag fájlnevét/verzióját amit használt, az üzenetet amit a Tor adott ki, stb."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "A fenti sorok használatához menjen a Vidalia Hálózati beállÃtások oldalára, majd kattintson \"Az internetszolgáltatóm blokkolja a Tor hálózathoz kapcsolódást\" opcióra. Utána egyesével adja hozzá a hÃdcÃmeket."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Nincsen elérhetÅ? hÃd."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "FrissÃtse a böngészÅ?jét Firefox-ra"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "�rja be a két szót"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1. lépés"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Szerezzen %s Tor böngészÅ? csomagot %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2. lépés"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Szerezzen be %s hidat %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3. lépés"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Most %s hozzáadja a hidakat a Tor %s-hez."
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/hy/LC_MESSAGES/bridgedb.po b/hy/LC_MESSAGES/bridgedb.po
index 4c386ce..09b4ada 100644
--- a/hy/LC_MESSAGES/bridgedb.po
+++ b/hy/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:45+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po
index 8657bde..5f2cc34 100644
--- a/hy_AM/LC_MESSAGES/bridgedb.po
+++ b/hy_AM/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-11-01 15:50+0000\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"
"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: hy_AM\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ia/LC_MESSAGES/bridgedb.po b/ia/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..4d36db6
--- /dev/null
+++ b/ia/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: ia\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po
index 1449290..94418ef 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# MasIs <is.roadster@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-12-10 10:16+0000\n"
-"Last-Translator: MasIs <is.roadster@xxxxxxxxx>\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"
+"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"
@@ -20,82 +19,315 @@ msgstr ""
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Apa itu 'bridge'?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s 'Bridge relays' %s adalah perelai Tor yang membantu Anda mengelakkan sensor."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Adakah cara lain untuk memperoleh 'bridges'?"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Cara lain untuk memperoleh alamat 'public bridge' adalah dengan mengirimkan email (dari sebuah %s atau %s alamat) ke %s yang hanya berisi 'get bridges' pada isi email."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Bridge saya gagal! Bantu saya!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Jika Tor Anda gagal bekerja, Anda harus menulis email %s. Cantumkan seluruh permasalahan yang Anda dapati, termasuk daftar 'bridge' yang Anda gunakan, nama file 'bundle' atau versi yang Anda pakai, pesan error Tor, dan sebagainya."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Untuk menggunakan baris di atas, pilih halaman pengaturan Vidalia's Network, dan klik \"My ISP blocks connections to the Tor network\". Kemudian tambahkan alamat 'bridge' satu per satu."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Saat ini tidak ada 'bridge' yang tersedia."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Ubah browser Anda menjadi Firefox."
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Ketikkan kedua kata tersebut."
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Langkah 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Dapatkan %s bundel Tor Browser %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Langkah 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Dapatkan %s 'bridge' %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Langkah 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "%s Tambahkan 'bridge' ke Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..5fcd85e
--- /dev/null
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: is\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po
index 59d9944..564cb67 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# fetidyoo <tru74368@xxxxxxxxx>, 2011
# Francesca Ciceri <madamezou@xxxxxxxxxx>, 2014
# ironbishop <ironbishop@xxxxxxxx>, 2011
@@ -17,10 +16,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-04-26 19:50+0000\n"
-"Last-Translator: Francesca Ciceri <madamezou@xxxxxxxxxx>\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"
+"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"
@@ -29,82 +28,315 @@ msgstr ""
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Cosa sono i bridge?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s I relay bridge %s sono relay Tor che aiutano ad eludere le censure."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Mi serve un altro modo per avere dei bridge!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Un altro metodo per trovare bridge pubblici è inviare una email (da un indirizzo %s o %s) a %s contenente la sola frase \"get bridges\"."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "I miei bridge non funzionano! Mi serve aiuto!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "In caso Tor non funzioni, inviare una email a %s. Fornire più informazioni possibili sul problema, inclusa la lista dei bridge che usati, nome e versione del bundle in uso, i messaggi ricevuti da Tor, ecc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Per utilizzare le righe precedenti, andare alla pagina Impostazioni di rete di Vidalia e fare clic su \"Il mio ISP blocca le connessioni alla rete Tor\". Quindi aggiungere l'indirizzo di ciascun bridge, uno alla volta."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Al momento non ci sono bridge disponibili"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Aggiornare il browser a Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Digitare le due parole"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Passo 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Scaricare %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Passo 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Ottenere dei %s bridge %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Passo 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Ora %s aggiungere i bridge a Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po
index cdb16cb..6db6808 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -1,19 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# brt <87@xxxxxxxxxxx>, 2013
# plazmism <gomidori@xxxxxxx>, 2013
-# msaito <rezoolab@xxxxxxxxx>, 2013
+# Masaki Saito <rezoolab@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-11-04 14:40+0000\n"
-"Last-Translator: msaito <rezoolab@xxxxxxxxx>\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"
+"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"
@@ -22,82 +21,315 @@ msgstr ""
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "ã??ã?ªã??ã?¸ã?¨ã?¯ï¼?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s ã??ã?ªã??ã?¸ã?ªã?¬ã?¼ %sã?¯æ¤?é?²ã??å??é?¿ã??ã??ã??ã?¨ã??å?©ã??ã??Torã?ªã?¬ã?¼ã?§ã??ã??"
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "ã??ã?ªã??ã?¸ã??å¾?ã??ä»?ã?®æ?¹æ³?ã??å¿?è¦?ã?§ã??!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "ã??ã??ã?ªã??ã?¯ã??ã?ªã??ã?¸ã?®ã?¢ã??ã?¬ã?¹ã??æ?¢ã??ä»?ã?®æ?¹æ³?ã?¯ã??(%sã??%sã?®ã?¢ã??ã?¬ã?¹ã??ã??) ã?¡ã?¼ã?«ã?®æ??é?¢ã?«ã??get bridgesã??ã?®è¡?ã??ã?¤ã??ã?¦%sã?«ã?¡ã?¼ã?«ã??é??ã??ã??ã?¨ã?§ã??ã??"
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "ç§?ã?®ã??ã?ªã??ã?¸ã??å??ã??ã?¾ã??ã??! å?©ã??ã?¦ã??ã? ã??ã??!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "ã??ã?ªã??ã?®Torã??å??ä½?ã??ã?ªã??ã?ªã??ã??%sã?«ã?¡ã?¼ã?«ã??ã??ã?¹ã??ã?§ã??ã?? 使ã?£ã?¦ã??ã??ã??ã?ªã??ã?¸ã?®ã?ªã?¹ã??ã??使ã?£ã?¦ã??ã??ã??ã?³ã??ã?«ã?®ã??ã?¡ã?¤ã?«å??/ã??ã?¼ã?¸ã?§ã?³ã??Torã??å?ºã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?ªã?©ã??ã?§ã??ã??ã? ã??å??é¡?ã?«ã?¤ã??ã?¦ã?®æ??å ±ã??å¤?ã??å?«ã??ã??ã??ã??ã?«ã??ã?¦ã??ã? ã??ã??ã??"
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "以ä¸?ã?®è¨?è¿°ã??使ç?¨ã??ã??ã?«ã?¯ã??Vidaliaã?®ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¼ã?¸ã?«è¡?ã??ã??ã??ç§?ã?®ISPã?¯Torã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã??ã?¦ã??ã?¾ã??ã??ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??ã??ã?®å¾?ã??å??ã??ã?ªã??ã?¸ã?¢ã??ã?¬ã?¹ã??1ã?¤ã??ã?¤è¿½å? ã??ã??ã?¾ã??ã??"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "ç?¾å?¨å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "ã??ã?©ã?¦ã?¶ã??Firefoxã?«ã?¢ã??ã??ã?°ã?¬ã?¼ã??"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "2ã?¤ã?®å??èª?ã??ã?¿ã?¤ã??ã??ã?¦ã??ã? ã??ã??"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "ã?¹ã??ã??ã?? 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Tor %s Browser Bundle %sã??æ??ã?«å?¥ã??ã??"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "ã?¹ã??ã??ã?? 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s ã??ã?ªã??ã?¸ %s ã??æ??ã?«å?¥ã??ã??"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "ã?¹ã??ã??ã?? 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ã??ã??ã?«%s Torã?«ã??ã?ªã??ã?¸ã??追å? %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/jv/LC_MESSAGES/bridgedb.po b/jv/LC_MESSAGES/bridgedb.po
index 4878136..6e43864 100644
--- a/jv/LC_MESSAGES/bridgedb.po
+++ b/jv/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:55+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: jv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po
index c8c2f29..048e06a 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -1,5 +1,5 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
@@ -7,10 +7,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-19 15:10+0000\n"
-"Last-Translator: x0rmia <x0rmia@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +19,315 @@ msgstr ""
"Language: ka\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:48
+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
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:88
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "á??á??á??á??á?¯á?? 1"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "á??á??á??á?¦á??á?? %s Tor á??á? á??á?£á??á??á? á??á?¡ á??á?£á?¡á?®á?? %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "á??á??á??á??á?¯á?? 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "á??á??á??á??á?¯á?? 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po
index 8b374ec..3183909 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Nurlan Rakhimzhanov <nurlan.rakhimzhanov@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-14 03:20+0000\n"
-"Last-Translator: Nurlan Rakhimzhanov <nurlan.rakhimzhanov@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: kk\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Ð?Ó©Ñ?Ñ?плеÑ? дегенÑ?мÑ?з не?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?өпÑ?Ñ?леÑ? алÑ?дÑ?Ò£ маÒ?ан баÑ?Ò?а жолÑ? кеÑ?ек!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Ð?енÑ?Ò£ көпÑ?Ñ?леÑ?Ñ?м жұмÑ?Ñ? Ñ?Ñ?Ñ?емейдÑ?! Ð?өмек Ò?ажеÑ?!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Ð?кÑ? Ñ?өз жазÑ?Ò£Ñ?з"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 8ae3ca8..7631175 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# soksophea <sksophea@xxxxxxxxx>, 2014
# soksophea <sksophea@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-02-07 02:29+0000\n"
-"Last-Translator: Sutha <sutha@xxxxxxxxxxx>\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "á??á?¾â??á??á??á??á??á?¸á??â??á??á?¶â??á?¢á??á??á?¸?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s á??á??á??á??á?¸á??â??á??á??á??á??á?¼á??â??á??á??á??á?? %s á??á?º Tor á??á??á??á??á?¼á??â??á??á??á??á??â??á??á??á??â??á??á?½á??â??á?¢á??á??á??â??á??á??á??á??á??á??â??á??á?¶á??â??á??á?·á??á??á??á??á??"
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á?·á??á?¸á??á?¶á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á?¶â??á??á??â??á??á?¶á??â??á??á??á?½á??â??á??á?¶á??â??á??á??á??á??á?¸á??!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "á??á?·á??á?¸â??á??á??á??á??á??á??á??á??â??á??á?¾á??á??á??á?¸â??á??á??â??á??á?¾á??â??á?¢á?¶á??á??á??á??á??á?¶á??â??á??á??á??á??á?¸á??â??á??á?¶á??á?¶á??á??á??â??á??á?º á??á?¶á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á?? (á??á?¸â??á?¢á?¶á??á??á??á??á??á?¶á?? %s á?¬ %s) á??á??á??á?¶á??á?? %s á??á??á??â??á??á?¶á??â??á??á??á??á??á?¶á??á??â??á?¢á??á??á??á?? 'get bridges' á??á??â??á??á??á??á?»á??â??á??á?½â??á??á??â??á?¢á??á?¸á??á??á??á??"
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "á??á??á??á??á?¸á??â??á??á??á??á??â??á??á??á??á?»á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??! á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á??á??á?½á??!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "á??á?¾ Tor á??á??á??á??â??á?¢á??á??á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??â??á??á?? á?¢á??á??á??â??á??á?½á??á??á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á?? %sâ??á?? á??á??á??â??á??á??á??á?¶á??á?¶á??â??á??á?½á??á??á??á??á??á?¼á??â??á??á??á??á??á??á?¶á??â??á?¢á??á??á?¸â??á??á??á??á?¸â??á??á??á??á??â??á?¢á??á??á??â??á?²á??á??â??á??á?¶á??â??á??á??á??á?¾á?? á??á?½á??á??á??á??á??á?¼á??â??á??á??á??á??á?¸â??á??á??á??á??á?¸á??â??á??á??á??â??á?¢á??á??á??â??á??á?¶á??â??á??á??á??á?¾ á??á?¶á??á??â??á??á??á??á??á??â??á?¯á??á??á?¶á??/á??á??á??á??â??á??á??á??â??á?¢á??á??á??â??á??á?¶á??â??á??á??á??á?¾ á??á?¶á??â??á??á??á?? Tor á??á?¶á??â??á??á??á??á??á??á??á??á??á??"
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "á??á?¾á??á??á??á?¸â??á??á??á??á?¾â??á??á??á??á??á?¶á??á??â??á?¢á??á??á??á??â??á??á?¶á??á??á?¾ á?¢á??á??á??â??á??á??á??á?¼á??â??á??á??á??á?¶á??á??â??á??á??á??á??á??â??á??á?¶á??â??á??á??á??á??á??â??á??á??á??á??á?¶á??â??á??á??á??á?? Vidalia á??á?½á??â??á??á?»á?? \"ISP á??á??á??á??â??á??á??á??á?»á??â??á??á??á??á??á??á??á?¶á??á??â??á??á?¶á??â??á??á??á??á??á?¶á??á??â??á??á??á??á?¶á??á??â??á??á??á??á??á?¶á?? Tor\" á?? á??á??á??á??á?¶á??á??á??á??â??á??á??á??á??á??á??â??á?¢á?¶á??á??á??á??á??á?¶á??â??á??á??á??á??á?¸á??â??á??á??á??á??â??á??á?½á??á??á??"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á??á??á??á?¸á??"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "á??á??á??á?¾â??á??á??á??á??á?»á??á??á??á??á??á??á??á?¶á??â??á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??á??á?? Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "á??á?¶á??â??á??á?¶á??á??á??â??á??á?¸á??"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "á??á??á? á?¶á??â??á??á?¸á?¡"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "á??á?? %s á??á?¶á??á??â??á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á?? Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "á??á??á? á?¶á??â??á??á?¸á?¢"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "á??á?? %s á??á??á??á??á?¸á?? %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "á??á??á? á?¶á??â??á??á?¸á?£"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "á?¥á?¡á?¼á?? %s á??á??á??á??á??á??â??á??á??á??á??á?¸á??â??á??á??á??á?¶á??á?? Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/kn/LC_MESSAGES/bridgedb.po b/kn/LC_MESSAGES/bridgedb.po
index 905e22d..cecb675 100644
--- a/kn/LC_MESSAGES/bridgedb.po
+++ b/kn/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# msj2, 2013
# msj2, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-07-31 03:40+0000\n"
-"Last-Translator: msj2\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +20,315 @@ msgstr ""
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "ಬ�ರಿಡ��� �ಳ� ��ದರ� �ನ�?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%sಬà³?ರಿಡà³?à²?à³?â??ನ ರಿಲà³?à²?ಳà³?%s à²?à²?ದರà³? ಸà³?ನà³?ಸಾರà³?â??à²?ಳಿà²?ದ ನಿಮà³?ಮನà³?ನà³? ದà³?ರವಿಡà³?ವ à²?ಾರà³? ರಿಲà³?à²?ಳà³?, "
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "ನನà²?à³? ಬà³?ರಿಡà³?à²?à³?â??à²?ಳà³? ಸಿà²?à³?ವ ಬದಲಿ ಮಾರà³?à²? ಬà³?à²?à³?"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "ಪಬà³?ಲಿà²?à³? ಬà³?ರಿಡà³?à²?à³?â??à²?ಳ à²?ಡà³?ರà³?ಸà³? ಪಡà³?ಯà³?ವ ದಾರಿಯà²?ದà³?ರà³?, %s à²? ವಿಳಾಸà²?à³?à²?à³? à²?ಮà³?ಲà³? à²?ಳಿಸಿ (à²?à²?ದ a %s à²?ಥವಾ a %s à²?ಡà³?ರà³?ಸà³? ) à²?ವರಿà²?à³?. à²? 'get bridges' à²?à²?ತ à²?ಮà³?ಲà³? à²?ಳà²?à³? ಬರà³?ಯಿರಿ."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "ನನà³?ನ ಬà³?ರಿಡà³?à²?à³?â??à²?ಳà³? à²?à³?ಲಸ ಮಾಡà³?ತಿಲà³?ಲ. ಸಹಾಯ ಮಾಡಿ"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "ನಿಮà³?ಮ à²?ಾರà³? à²?à³?ಲಸ ಮಾಡದà³? à²?ದà³?ರà³?, %s à²?à³? à²?ಮà³?ಲà³? à²?ಳಿಸಿ. ಬà³?ರಿಡà³?à²?à³?â??à²?ಳ ಪà²?à³?à²?ಿ, ಬà²?ಡಲà³?â??ನ ಫ಼à³?ಲà³?â?? ಹà³?ಸರà³?/ವರà³?ಷನà³?, à²?ಾರà³? à²?à³?à²?à³?à²? ಮà³?ಸà³?à²?à³?â??à²?ಳà³?, à²?ರರà³? ಮà³?ಸà³?à²?à³?â??à²?ಳà³?, à²? ರà³?ತಿ ಸಾಧà³?ಯವಿದà³?ದಷà³?à²?à³? ಮಾಹಿತಿಯನà³?ನà³? à²?ಮà³?ಲà³?â??ನಲà³?ಲಿ à²?ಳಿಸಿ."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "ಮà³?ಲà³?à²?à²?ಡ ಲà³?ನà³?â??à²?ಳನà³?ನ ಬಳಸಲà³?, ವಿಡಲಿಯಾದ à²?ಾಲಬà²?ಧ ಸà³?à²?à³?à²?ಿà²?à²?à³?â?? ಪà³?à²?à²?à³?à²? ಹà³?à²?ಿ, à²?ಲà³?ಲಿ \"My ISP blocks connections to the Tor network\" à²?ನà³?ನà³?ವà³?ದರ ಮà³?ಲà³? à²?à³?ಲಿà²?à³? ಮಾಡಿ. ನà²?ತರ, à²?à²?ದà³?à²?ದà³? ಬà³?ರಿಡà³?à²?à³?â?? à²?ಡà³?ರà³?ಸà³?â??ನ à²?à³?ಡà³?ತà³?ತಾ ಹà³?à²?ಿ."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "ಯಾವ ಬà³?ರಿಡà³?à²?à³?â??à²?ಳà³? ಸದà³?ಯà²?à³?à²?à³? ಲà²à³?ಯವಿಲà³?ಲ"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "ನಿಮà³?ಮ ಬà³?ರà³?ಸರà³?â??ನ ಫ಼à³?ರà³?â??ಫ಼ಾà²?à³?ಸà³?â??à²?à³? ಬದಲಿಸಿà²?à³?ಳà³?ಳಿ"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "�ರಡ� ಪದ�ಳನ�ನ� ��ಪ� ಮಾಡಿ"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "ಹ����� ೧"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "ಪಡ�ಯಿರಿ %s �ಾರ� ಬ�ರ�ಸರ� ಬ�ಡಲ� %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "ಹ����� ೨"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ಪಡà³?ಯಿರಿ %s ಬà³?ರಿಡà³?à²?à³?â??à²?ಳà³? %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "ಹ����� ೩"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "à²?ದà³?à²?, %s à²? ಬà³?ರಿಡà³?à²?à³?â??à²?ಳನà³?ನ %s à²?ಾರà³?â??à²?à³? à²?à³?ಡಿಸಿà²?à³?ಳà³?ಳಿ."
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index e877b87..266957c 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# ilbe123 <a3057016@xxxxxxxxx>, 2014
# cwt96 <cwt967@xxxxxxxxx>, 2012
# Dr.what <javrick6@xxxxxxxxx>, 2014
@@ -11,10 +10,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-05-06 06:40+0000\n"
-"Last-Translator: ilbe123 <a3057016@xxxxxxxxx>\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"
+"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"
@@ -23,82 +22,315 @@ msgstr ""
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "'ë¸?릿ì§?'ë???"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "ì¤?ê³? ì??ë²? ë¸?릿ì§? %s ì¤?ì??ì??, %s ê°? ì?¬ë?¬ë¶?ì?? ê²?ì?´ ì?°í??를 ë??ì??ì¤? ì?? ì??ë?? Tor ì¤?ê³? ì??ë²? ì??ë??ë?¤."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "ë¸?릿ì§?를 ì?»ë?? ë?¤ë¥¸ ë°©ë²?ì?´ ì??ì??ê¹?ì???"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "ê³µê°?ë?? ë¸?릿ì§? 주ì??를 ì°¾ì?? ë??, í?µì? ì? ì?? 'get brides'ë?¼ê³ ì?´ë©?ì?¼ì?? ì ?ì?´ì?? ë³´ë?´ë?? ë°©ë²?ë?? ì??ì?µë??ë?¤.(ë©?ì?¼ì?? ë³´ë?´ë?? ì?¬ë??ì?? 주ì?? í??기ë?? from %s ë??ë?? %s 주ì??)"
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "ë¸?릿ì§?ê°? ë§?ì?´ ê°?ì?´ì??! ë??ì??ì¤?ì??!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "ê·?í??ì?? í? 르ê°? ì??ë??í??ì§? ì??ë??ë?¤ë©´, %sì?? ì?´ë©?ì?¼ì?? ë³´ë?´ì??ì?¼ í?©ë??ë?¤. ê°?ë?¥í?? í?? ë§?ì?? ì ?보를 í?¬í?¨í?´ì?? ë³´ë?´ì£¼ì?¸ì??. ì??를 ë?¤ë©´ ê·?í??ê°? ì?¬ì?©í?? ë¸?릿ì§?ì?? 목ë¡?, ê·?í??ê°? ì?¬ì?©í??ë?? ë²?ë?¤ì?? í??ì?¼ ì?´ë¦?ê³¼ ë²?ì ?, ê·?í??ì?? í? 르ê°? ë§? ê°?ì?? ë?? ë??ì?¨ ë©?ì?¸ì§?. ì?´ ì?¸ì??ë?? ì ?ì?? ì?? ì??ë?? ì?¬ë?¬ ê°?ì§?."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "ì?? í?µì? ì? ì?? ì?¬ì?©í??ì??ë ¤ë©´ 'Vidalia's Network settings'-ë¹?ë?¬ë¦¬ì?? ë?¤í?¸ì??í?¬ ì?¤ì ?-í??ì?´ì§?ì?? ë?¤ì?´ê°? í??, 'My ISP blocks connections to the Tor network'-Tor ë?¤í?¸ì??í?¬ì?? ë?´ ISP ì?°ê²°ì?? ì°¨ë?¨-ì?? í?´ë¦í?©ë??ë?¤. ê·¸ë?¬ë©´ í??ë²?ì?? ê°?ê°?ì?? ë¸?릿ì§? 주ì??를 ì¶?ê°? í? ì?? ì??ì?µë??ë?¤."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "í??ì?¬ ì?´ì?© ê°?ë?¥í?? ë¸?릿ì§? ì??ì??"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "ë?¹ì? ì?? ë¸?ë?¼ì?°ì ?를 í??ì?´ì?´í?ì?¤ë¡? ì??ê·¸ë ?ì?´ë?? í??ì?¸ì??!"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "ë??ê°?ì?? ë?¨ì?´ë¥¼ ì??ë ¥í??ì?ì??ì?¤"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1��"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Tor %s Browser Bundle %s를 ì??ì??"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2��"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s ë¸?릿ì§? %s를 ì??ì??"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3��"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "곧 �� %s Tor �리�를 �� %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ko_KR/LC_MESSAGES/bridgedb.po b/ko_KR/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..405b6f8
--- /dev/null
+++ b/ko_KR/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: ko_KR\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ku/LC_MESSAGES/bridgedb.po b/ku/LC_MESSAGES/bridgedb.po
index 2332817..4124f47 100644
--- a/ku/LC_MESSAGES/bridgedb.po
+++ b/ku/LC_MESSAGES/bridgedb.po
@@ -1,14 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-18 12:04+0000\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"
"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"
@@ -18,82 +18,315 @@ msgstr ""
"Language: ku\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/kw/LC_MESSAGES/bridgedb.po b/kw/LC_MESSAGES/bridgedb.po
index 96a9a46..421a1c4 100644
--- a/kw/LC_MESSAGES/bridgedb.po
+++ b/kw/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:54+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: kw\n"
"Plural-Forms: nplurals=4; plural=(n==1) ? 0 : (n==2) ? 1 : (n == 3) ? 2 : 3;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ky/LC_MESSAGES/bridgedb.po b/ky/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..4b83258
--- /dev/null
+++ b/ky/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: ky\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/lb/LC_MESSAGES/bridgedb.po b/lb/LC_MESSAGES/bridgedb.po
index c57dde4..5472fc9 100644
--- a/lb/LC_MESSAGES/bridgedb.po
+++ b/lb/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:44+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/lg/LC_MESSAGES/bridgedb.po b/lg/LC_MESSAGES/bridgedb.po
index 7b9a3ca..de12cc1 100644
--- a/lg/LC_MESSAGES/bridgedb.po
+++ b/lg/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:54+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: lg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ln/LC_MESSAGES/bridgedb.po b/ln/LC_MESSAGES/bridgedb.po
index ef36c7f..c24bf46 100644
--- a/ln/LC_MESSAGES/bridgedb.po
+++ b/ln/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:44+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ln\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/lo/LC_MESSAGES/bridgedb.po b/lo/LC_MESSAGES/bridgedb.po
index 334a73f..1284717 100644
--- a/lo/LC_MESSAGES/bridgedb.po
+++ b/lo/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:44+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: lo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index e84f404..de310f3 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# TylQuest <tylquest@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-19 23:06+0000\n"
-"Last-Translator: TylQuest <tylquest@xxxxxxxxx>\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"
+"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"
@@ -20,82 +19,315 @@ msgstr ""
"Language: lt\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:114
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Įrašyti du žodžius"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Žingsnis 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Žingsnis 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Žingsnis 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po
index dea7a31..e929a64 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -1,5 +1,5 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
@@ -8,9 +8,9 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-04-29 09:24+0000\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"
"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"
@@ -20,82 +20,315 @@ msgstr ""
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Kas ir tilti?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Tiltu retranslatori %s ir Tor'a retranslatori, kuri palīdz apiet cenzūru."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Man nepieciešams alternatīvs tiltu iegūšanas veids!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Cits veids kÄ? uzzinÄ?t tiltu publiskÄ?s adreses ir nosÅ«tÄ«t e-pastu (no %s vai %s adresÄ?m) uz %s , iekļaujot rindu 'get bridges' ziÅ?ojuma korpusÄ?."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mani tilti nestrÄ?dÄ?! Man nepiecieÅ¡ama palÄ«dzÄ«ba!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ja JÅ«su Tor nestrÄ?dÄ?, rakstiet e-pastu %s. Iekļaujiet pÄ?c iespÄ?jas vairÄ?k informÄ?cijas par konkrÄ?to situÄ?ciju, tostarp lietoto tiltu sarakstu, izmantotÄ? komplekta versiju/datnes vÄ?rdu, Tor sniegtos ziÅ?ojumus, utt."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Lai izmantotu augstÄ?k norÄ?dÄ«tÄ?s rindas, atveriet Vidalia's TÄ«kla iestatÄ«jumu lapu un noklikÅ¡Ä·iniet \"Mans IPS bloÄ·Ä? savienojumus ar tÄ«klu Tor\". PÄ?c tam pievienojiet pa vienam katra tilta adresi."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Pašreiz neviens tilts nav pieejams"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Jauniniet savu pÄ?rlÅ«ku uz Firefox"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Rakstiet divus vÄ?rdus"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1. solis"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "SaÅ?emt %s PÄ?rlÅ«ka Tor komplektu %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2. solis"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "SaÅ?emt %s tiltus %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3. solis"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Tagad %s pievienot Tor'am tiltus %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/mg/LC_MESSAGES/bridgedb.po b/mg/LC_MESSAGES/bridgedb.po
index 790ad8b..d51e994 100644
--- a/mg/LC_MESSAGES/bridgedb.po
+++ b/mg/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:50+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: mg\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/mi/LC_MESSAGES/bridgedb.po b/mi/LC_MESSAGES/bridgedb.po
index ed62db9..bda7f81 100644
--- a/mi/LC_MESSAGES/bridgedb.po
+++ b/mi/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:51+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: mi\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po
index d509e3c..ea612d9 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# VHR <viktor.hr@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-12 22:21+0000\n"
-"Last-Translator: VHR <viktor.hr@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "ШÑ?о Ñ?е пÑ?емоÑ?Ñ?Ñ?ваÑ?а?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ñ?елеи за Ð?Ñ?емоÑ?Ñ?Ñ?ваÑ?а %s Ñ?е Tor Ñ?елеи кои Ñ?и помагааÑ? да го заобиколиÑ? Ñ?ензÑ?Ñ?иÑ?аÑ?еÑ?о."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?и Ñ?Ñ?еба алÑ?еÑ?наÑ?ивен наÑ?ин да добиÑ?ам пÑ?емоÑ?Ñ?Ñ?ваÑ?а!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ð?Ñ?Ñ?г наÑ?ин да Ñ?е наÑ?даÑ? адÑ?еÑ?иÑ?е на Ñ?авниÑ?е пÑ?емоÑ?Ñ?Ñ?ваÑ?а е да Ñ?е пÑ?аÑ?и е-поÑ?Ñ?а (од %s или %s адÑ?еÑ?а) на %s Ñ?о Ñ?екÑ?Ñ? 'get bridges' во Ñ?одÑ?жинаÑ?а на поÑ?Ñ?аÑ?а."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Ð?оиÑ?е пÑ?емоÑ?Ñ?Ñ?ваÑ?а не Ñ?Ñ?нкÑ?иониÑ?ааÑ?! Ð?и Ñ?Ñ?еба помоÑ?!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ð?ко Ñ?воÑ?оÑ? Tor не Ñ?Ñ?нкÑ?иониÑ?а, Ñ?Ñ?еба да пÑ?аÑ?иÑ? е-поÑ?Ñ?а на %s. Ð?Ñ?обаÑ? да внеÑ?еÑ? колкÑ? Ñ?Ñ?о можеÑ? повеÑ?е инÑ?оÑ?маÑ?ии за Ñ?воÑ?оÑ? Ñ?лÑ?Ñ?аÑ?, вклÑ?Ñ?иÑ?елно и лиÑ?Ñ?а од пÑ?емоÑ?Ñ?Ñ?ваÑ?а кои ги коÑ?иÑ?Ñ?иÑ?, имеÑ?о/веÑ?зиÑ?аÑ?а на пакеÑ?оÑ? коÑ? го коÑ?иÑ?Ñ?иÑ?, поÑ?акиÑ?е кои ги добиваÑ? од Tor, иÑ?н."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Ð?а да ги коÑ?иÑ?Ñ?иÑ? гоÑ?ниве линии, оди на Ñ?Ñ?Ñ?анаÑ?а на подеÑ?Ñ?ваÑ?а на Vidalia's Network, и избеÑ?и \"Ð?оÑ?оÑ? ISP ги блокиÑ?а вÑ?Ñ?киÑ?е кон мÑ?ежаÑ?а на Tor\". Ð?оÑ?оа додаÑ? Ñ?а адÑ?еÑ?аÑ?а на Ñ?екое пÑ?емоÑ?Ñ?Ñ?ваÑ?е еднаÑ?."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ð?Ñ?емоÑ?Ñ?Ñ?ваÑ?аÑ?а Ñ?е моменÑ?ално недоÑ?Ñ?апни"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Ð?адгÑ?ади го Ñ?воÑ?оÑ? пÑ?егледÑ?ваÑ? во Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Ð?апиÑ?и ги дваÑ?а збоÑ?а"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "ЧекоÑ? 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Ð?еми %s пакеÑ? пÑ?елиÑ?Ñ?Ñ?ваÑ? Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "ЧекоÑ? 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?еми %s пÑ?емоÑ?Ñ?Ñ?ваÑ?а %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "ЧекоÑ? 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Сега %s додаÑ? ги пÑ?емоÑ?Ñ?Ñ?ваÑ?аÑ?а во Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index 26eafcc..e2b0dfa 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:51+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ml\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/mn/LC_MESSAGES/bridgedb.po b/mn/LC_MESSAGES/bridgedb.po
index 0f416f2..2ef6923 100644
--- a/mn/LC_MESSAGES/bridgedb.po
+++ b/mn/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:51+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: mn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po
index f21686a..5016bc0 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-07-28 08:26+0000\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"
"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: mr\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ms_MY/LC_MESSAGES/bridgedb.po b/ms_MY/LC_MESSAGES/bridgedb.po
index 94bd12a..8eab674 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# shahril <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\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-11-05 05:30+0000\n"
-"Last-Translator: shahril <mohd_shahril_96@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +20,315 @@ msgstr ""
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Apakah itu bridges ?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays %s adalah tor relays yang akan membantu anda menghindari penapisan Internet."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Saya perlukan cara alternatif untuk mendapatkan bridges!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Cara lain bagi mencari alamat bridges awam adalah dengan menghantar email (dari %s atau alamat %s) ke %s dengan menulis 'get bridges' pada badan email tersebut."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Bridges saya tidak berfungsi! Saya perlukan bantuan!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Jika Tor kamu tidak berfungsi, kamu patut menghantar e-mel kepada %s. Cuba masukkan sebanyak mana info yang boleh terhadap permasalahan kamu, termasuk senarai bridges yang kamu guna, dan nama fail bundle dan versi bundle yang kamu guna, dan mesej yang Tor tunjukkan, dan lain-lain."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Untuk menggunakan bridges di bawah, pergi ke halaman tetapan Rangkaian Vidalia, dan klik \"ISP saya menyekat sambungan saya ke rangkaian Tor\". Kemudian tambah setiap alamat bridges satu per satu."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Tiada bridges pada masa sekarang."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Menaik taraf firefox anda"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Tulis dua perkataan itu."
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Langkah 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Dapatkan %s Tor Browser Bundle %s."
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Langkah 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Dapatkan %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Langkah 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Kemudian %s tambah bridges tersebut ke Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/mt/LC_MESSAGES/bridgedb.po b/mt/LC_MESSAGES/bridgedb.po
index 005bebc..ae954f4 100644
--- a/mt/LC_MESSAGES/bridgedb.po
+++ b/mt/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:51+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: mt\n"
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : n==0 || ( n%100>1 && n%100<11) ? 1 : (n%100>10 && n%100<20 ) ? 2 : 3);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/my/LC_MESSAGES/bridgedb.po b/my/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..b8bdf18
--- /dev/null
+++ b/my/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: my\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/nah/LC_MESSAGES/bridgedb.po b/nah/LC_MESSAGES/bridgedb.po
index 95b5bdd..a4315a3 100644
--- a/nah/LC_MESSAGES/bridgedb.po
+++ b/nah/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:55+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: nah\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/nap/LC_MESSAGES/bridgedb.po b/nap/LC_MESSAGES/bridgedb.po
index daf521f..b0e34cb 100644
--- a/nap/LC_MESSAGES/bridgedb.po
+++ b/nap/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:54+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: nap\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 50417e7..88b77f9 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -1,5 +1,5 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
@@ -7,10 +7,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-13 18:45+0000\n"
-"Last-Translator: lateralus\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"
+"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"
@@ -19,82 +19,315 @@ msgstr ""
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Hva er broer?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bro-reléer %s er Tor reléer som hjelper deg å omgå sensur."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Jeg trenger en alternativ måte å få broer på!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "En annen måte å finne offentlige broadresser på er ved å sende en e-post (fra en %s eller en %s adresse) til %s med linjen 'get bridges' som eneste innhold i en e-post."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Hvis Tor ikke virker, bør du sende e-post til %s. Prøv å få med så mye informasjon om saken din som mulig, inkludert listen over broer du brukte, filnavnet/versjonen på programmet, meldingene Tor gav deg, etc. "
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "For å bruke overnevnte, gå til siden med Vidalias nettverksinnstillinger, og klikk \"Internettleverandøren min blokkerer tilkoblinger til Tor-nettverket\". Legg så til én broadresse om gangen."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ingen broer er tilgjengelige for øyeblikket"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Oppgradér nettleseren din til Firefox"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Skriv de to ordene"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Steg 1"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Hent %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Steg 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Hent %s broer %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Steg 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "NÃ¥ %s legg til broene i Tor %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/nds/LC_MESSAGES/bridgedb.po b/nds/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..dc9f7b7
--- /dev/null
+++ b/nds/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: nds\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ne/LC_MESSAGES/bridgedb.po b/ne/LC_MESSAGES/bridgedb.po
index 95a2a8b..ea4d49a 100644
--- a/ne/LC_MESSAGES/bridgedb.po
+++ b/ne/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:53+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ne\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po
index 09272dc..1b2efe4 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Adriaan Callaerts <adriaan.callaerts@xxxxxxxxx>, 2013
# erwindelaat <erwin.de.laat@xxxxxxxxxxxxxx>, 2014
# WMRKameleon <info@xxxxxxxxxxxxxx>, 2013
@@ -13,10 +12,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-02-19 14:11+0000\n"
-"Last-Translator: erwindelaat <erwin.de.laat@xxxxxxxxxxxxxx>\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"
+"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"
@@ -25,82 +24,315 @@ msgstr ""
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays %s zijn Tor relays die je in staat stellen censuur te omzeilen."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Een andere manier om publieke bridges te vinden is door een e-mail te sturen (van een %s of een %s-adres) naar %s met enkel de regel 'get bridges' in de inhoud van de e-mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Als je Tor niet werkt, zou je %s moeten e-mailen. Probeer zo veel mogelijk informatie over de situatie te verzamelen, inclusief de lijst van bridges die u heeft gebruikt, de bestandsnaam en -versie van de bundel die u gebruikt, de berichten die Tor uitgaf, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Om de bovenstaande regels te gebruiken, ga naar Vidalia's Netwerk instellingen pagina en klik op \"Mijn ISP blokkeert verbindingen naar het Tor netwerk\". Voeg daarna elke bridge, één voor één, toe. "
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Er zijn momenteel geen bridges beschikbaar."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Upgrade uw browser naar Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Typ de twee woorden"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Stap 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Download %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Stap 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Download %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Stap 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "%s Voeg nu de bridges aan Tor toe %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/nl_BE/LC_MESSAGES/bridgedb.po b/nl_BE/LC_MESSAGES/bridgedb.po
index dd03318..132589b 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-12-30 18:31+0000\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"
"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: nl_BE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po
index 20e3fe1..fb6c62e 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:53+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: nn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/nso/LC_MESSAGES/bridgedb.po b/nso/LC_MESSAGES/bridgedb.po
index 31f8ad6..69eb442 100644
--- a/nso/LC_MESSAGES/bridgedb.po
+++ b/nso/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:43+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: nso\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/oc/LC_MESSAGES/bridgedb.po b/oc/LC_MESSAGES/bridgedb.po
index 5cf8bd0..4e941f6 100644
--- a/oc/LC_MESSAGES/bridgedb.po
+++ b/oc/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:52+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: oc\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/or/LC_MESSAGES/bridgedb.po b/or/LC_MESSAGES/bridgedb.po
index ead8262..58a38bd 100644
--- a/or/LC_MESSAGES/bridgedb.po
+++ b/or/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:56+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: or\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..e3985eb
--- /dev/null
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/pap/LC_MESSAGES/bridgedb.po b/pap/LC_MESSAGES/bridgedb.po
index 6caccee..bc0064c 100644
--- a/pap/LC_MESSAGES/bridgedb.po
+++ b/pap/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:53+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: pap\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po
index 07dd413..0e2c7d1 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# yodaa <slayer123312@xxxxxxxxx>, 2013
+# yodaa <aron.plotnikowski@xxxxxxxxxxxxx>, 2013
# JerBen <ayurveda63@xxxxxxxxx>, 2012
# bogdrozd <bog.d@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-24 00:30+0000\n"
-"Last-Translator: yodaa <slayer123312@xxxxxxxxx>\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"
+"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"
@@ -21,82 +21,315 @@ msgstr ""
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Czym sÄ? mostki?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Przekaźniki mostkowe %s sÄ? przekaźnikami Tora, które pozwalajÄ? obchodziÄ? cenzurÄ?."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "PotrzebujÄ? alternatywnego sposobu na pozyskanie mostków!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Innym sposobem na znalezienie publicznych adresów mostków jest wysÅ?anie e-maila (z adresu %s lub %s) na %s z samÄ? liniÄ? 'get bridges' w zawartoÅ?ci wiadomoÅ?ci"
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Moje mostki nie dziaÅ?ajÄ?! PotrzebujÄ? pomocy!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "JeÅ?li Tor nie dziaÅ?a, powinno siÄ? wysÅ?aÄ? e-mail do %s. Spróbuj podaÄ? tak dużo informacji, jak tylko możesz, Å?Ä?cznie z listÄ? mostków, nazwÄ?/wersjÄ? instalatora, komunikaty wyÅ?wietlane przez Tora itd."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Aby użyÄ? powyższych linii, wejdź na stronÄ? UstawieÅ? Sieciowych Vidalii i kliknij \"Mój dostawca blokuje poÅ?Ä?czenia do sieci Tora\". Potem dodaj każdy adres mostka po jednym na raz."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "W tej chwili nie ma dostÄ?pnych mostków"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Zaktualizuj swojÄ? przeglÄ?darkÄ? na Firefoksa."
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Wpisz dwa sÅ?owa"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Krok 1"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Pobierz %s PaczkÄ? Tora z PrzeglÄ?darkÄ? %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Krok 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Pobierz %s mostki %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Krok 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Teraz %s dodaj mostki do Tora %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/pms/LC_MESSAGES/bridgedb.po b/pms/LC_MESSAGES/bridgedb.po
index 198aff7..fd17309 100644
--- a/pms/LC_MESSAGES/bridgedb.po
+++ b/pms/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:52+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: pms\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ps/LC_MESSAGES/bridgedb.po b/ps/LC_MESSAGES/bridgedb.po
index 355a6f6..440ebaa 100644
--- a/ps/LC_MESSAGES/bridgedb.po
+++ b/ps/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:43+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ps\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po
index da9c017..4270da1 100644
--- a/pt/LC_MESSAGES/bridgedb.po
+++ b/pt/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
+# André Monteiro <andre.monteir@xxxxxxxxx>, 2014
# kagazz <lourenxo_619@xxxxxxxxxxx>, 2014
# TiagoJMMC <tiagojmmc@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-08 14:40+0000\n"
-"Last-Translator: TiagoJMMC <tiagojmmc@xxxxxxxxx>\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:15+0000\n"
+"Last-Translator: André Monteiro <andre.monteir@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"
@@ -21,82 +21,315 @@ msgstr ""
"Language: pt\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr "Pedimos desculpa, mas ocorreu algo errado com o seu pedido!"
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Esta é uma mensagem automática, por favor não responda.]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "Aqui estão as suas bridges"
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "O que são 'bridges'?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Os retransmissores bridge %s são retransmissores Tor que o ajudam a contornar a censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Preciso de uma alternativa para aceder a bridges!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Uma outra maneira de encontrar endereços para bridges públicas passa por enviar um email (a partir de um endereço %s ou %s) para %s, unicamente com o texto 'get bridges' no corpo do email."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "As minhas bridges não funcionam! Preciso de ajuda!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Se o seu Tor não funcionar, deverá enviar um email para %s. Tente incluir o máximo de informação possÃvel relativa ao seu problema, incluindo a lista de bridges utilizadas, o nome de ficheiro/versão do bundle utilizado, as mensagens indicadas pelo Tor, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para utilizar as linhas supramencionadas, aceda à página de configurações de rede do Vidalia e clique em \"O meu ISP bloqueia ligações à rede Tor\". De seguida, adicione os endereços bridge um a um."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "De momento não existem bridges disponÃveis"
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Actualize o seu navegador Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Escreva as duas palavras"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Passo 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obtenha o %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Passo 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtenha as %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Passo 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Agora %s adicione as bridges ao Tor %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 3d6ba21..6bf48c7 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -1,19 +1,18 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Communia <ameaneantie@xxxxxxxxxx>, 2013
# Augustine <evandro@xxxxxxxxxxxxx>, 2013
# Snake Plissken <>, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-08-20 22:20+0000\n"
-"Last-Translator: Communia <ameaneantie@xxxxxxxxxx>\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"
+"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"
@@ -22,82 +21,315 @@ msgstr ""
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "O que são pontes?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Retransmissores de ponte %s são retransmissores Tor que ajudam a driblar a censura."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Preciso de um outro modo de obter pontes!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Outra maneira de encontrar endereços de pontes públicas, é enviando um e-mail (de um endereço %s ou %s) para %s apenas com o texto 'get bridges' no corpo da mensagem."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Minhas pontes não funcionam! Preciso de ajuda!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Se seu Tor não funcionar, envie um e-mail para %s. Inclua tantas informações sobre seu caso quanto puder, por exemplo, a lista de pontes utilizadas, a versão ou o nome do arquivo do pacote Tor, as mensagens que o Tor tiver mostrado, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Para utilizar as informações acima, abra a página de configurações de rede do\nVidalia, e clique em \"Meu ISP bloqueia as conexões para a rede Tor\". Depois,\nadicione cada ponte, uma a uma."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Nenhuma ponte disponÃvel no momento"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Atualize seu navegador para Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Digite as duas palavras"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1º Passo"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Obtenha %s o Pacote de Navegação Tor %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2º Passo"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter %s pontes %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3º Passo"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Agora, %s adicione as pontes ao Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index f0d5a3d..2df5c77 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Simona Trifoi <adrianatrifoi@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-11-11 22:50+0000\n"
-"Last-Translator: Simona Trifoi <adrianatrifoi@xxxxxxxxx>\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"
+"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"
@@ -20,82 +19,315 @@ msgstr ""
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Ce sunt punÈ?ile? "
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Am nevoie de o cale alternativÄ? de a obÈ?ine punÈ?ile !"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "PunÈ?ile mele nu funcÈ?ioneazÄ?! Am nevoie de ajutor!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:114
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "IntroduceÈ?i cele douÄ? cuvinte"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Pasul 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Pasul 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Pasul 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index 887b7c7..2ccb470 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# varnav <varnavruz@xxxxxxxxx>, 2013
+# varnav, 2013
# liquixis <liquixis@xxxxxxxxx>, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-23 07:20+0000\n"
-"Last-Translator: varnav <varnavruz@xxxxxxxxx>\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"
+"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"
@@ -20,82 +20,315 @@ msgstr ""
"Language: ru\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "ЧÑ?о Ñ?акое Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?ипа моÑ?Ñ??"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ð?оÑ?Ñ?Ñ? %s Ñ?Ñ?о Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?Ñ? Tor коÑ?оÑ?Ñ?е помогаÑ?Ñ? обойÑ?и Ñ?ензÑ?Ñ?Ñ?."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?не нÑ?жен алÑ?Ñ?еÑ?наÑ?ивнÑ?й Ñ?поÑ?об полÑ?Ñ?ениÑ? Ñ?пиÑ?ка моÑ?Ñ?ов!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ð?Ñ?Ñ?гой Ñ?поÑ?обо найÑ?и пÑ?блиÑ?нÑ?й моÑ?Ñ? - поÑ?лаÑ?Ñ? пиÑ?Ñ?мо (Ñ? адÑ?еÑ?а %s или %s) на %s Ñ? одной Ñ?Ñ?Ñ?оÑ?кой 'get bridges' в Ñ?еле пиÑ?Ñ?ма."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Ð?ои моÑ?Ñ?Ñ? не Ñ?абоÑ?аÑ?Ñ?! Ð?омогиÑ?е!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ð?Ñ?ли Tor не Ñ?абоÑ?аеÑ? - напиÑ?иÑ?е %s. Ð?пиÑ?иÑ?е пÑ?облемÑ? как можно более подÑ?обно, Ð?ведиÑ?е Ñ?пиÑ?ок иÑ?полÑ?зованнÑ?Ñ? моÑ?Ñ?ов, имÑ? Ñ?айла/веÑ?Ñ?иÑ?, коÑ?оÑ?Ñ?Ñ? вÑ? иÑ?полÑ?зовали, Ñ?ообÑ?ениÑ? об оÑ?ибкаÑ? и пÑ?оÑ?ее."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Ð?лÑ? иÑ?полÑ?зованиÑ? Ñ?Ñ?Ñ?ок вÑ?Ñ?е, оÑ?кÑ?ойÑ?е Ñ?Ñ?Ñ?аниÑ?Ñ? Vidalia наÑ?Ñ?Ñ?ойки СеÑ?и, и нажмиÑ?е\n\"Ð?ой пÑ?овайдеÑ? Ð?нÑ?еÑ?неÑ? блокиÑ?Ñ?еÑ? Ñ?оединениÑ? Ñ? Ñ?еÑ?Ñ?Ñ? Tor\". Ð?аÑ?ем добавÑ?Ñ?е каждÑ?й адÑ?еÑ? моÑ?Ñ?а\nза Ñ?аз."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ð?а даннÑ?й моменÑ? неÑ? доÑ?Ñ?Ñ?пнÑ?Ñ? моÑ?Ñ?ов"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Ð?бновиÑ?е ваÑ? бÑ?аÑ?зеÑ? до Firefox"
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Ð?ведиÑ?е два Ñ?лова"
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Шаг 1"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Ð?олÑ?Ñ?иÑ?е %s пакеÑ? Tor Browser %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Шаг 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?олÑ?Ñ?иÑ?е %s моÑ?Ñ?Ñ? %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Шаг 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ТепеÑ?Ñ? %s добавÑ?Ñ?е моÑ?Ñ?Ñ? в Tor %s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ru@petr1708/LC_MESSAGES/bridgedb.po b/ru@petr1708/LC_MESSAGES/bridgedb.po
index bdd2f64..c01e607 100644
--- a/ru@petr1708/LC_MESSAGES/bridgedb.po
+++ b/ru@petr1708/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:15+0000\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"
"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ru@petr1708\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/sco/LC_MESSAGES/bridgedb.po b/sco/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..c25e169
--- /dev/null
+++ b/sco/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sco\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/si_LK/LC_MESSAGES/bridgedb.po b/si_LK/LC_MESSAGES/bridgedb.po
index d063510..3d2c2a1 100644
--- a/si_LK/LC_MESSAGES/bridgedb.po
+++ b/si_LK/LC_MESSAGES/bridgedb.po
@@ -1,5 +1,5 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
@@ -7,10 +7,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-24 16:50+0000\n"
-"Last-Translator: ganeshwaki <ganeshwaki@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +19,315 @@ msgstr ""
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "à·?à·?à¶à·? යනà·? මà·?නà·?à·?ද?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s à·?à·?à¶à·? පà·?â??රà¶à·?යà·?ජà¶?%s යනà·? à·?à·?රණය මà¶?à·?රà·?න Tor පà·?â??රà¶à·?යà·?ජà¶?යනà·?ය."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "à·?à·?à¶à·? ලබà·?à¶?à·?නà·?මට à·?à·?à¶?ලà·?ප à·?à·?ධà·?යà¶?à·? මට à¶?à·?à·?à·?â??යය!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "à·?à·?à¶à·? ලà·?පà·?නයනà·? à·?à·?යà·?à¶?à·?නà·?මà·? à¶à·?à¶à·? à¶?à¶?à·?රයà¶?à·? නමà·? à·?à·?දà·?â??යà·?à¶à·? ලà·?පà·?යà¶?à·? යà·?මà·? à¶?à·?රà·?මයà·? (from a %s or a %s address) to %s 'get bridges' යනà·?න à·?à·?දà·?â??යà·?à¶à·? ලà·?පà·?යà·? බද à¶?à·?ටà·?à·? à·?දà·?නà·? à¶?ල යà·?à¶à·?ය."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "මà·?à¶?à·? à·?à·?à¶à·? à·?à·?ඩ නà·?à¶?රයà·?! මට à¶?දà·?à·? à¶?à·?à·?à·?â??යයà·?!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "à¶?බà¶?à·? Tor à·?à·?ඩ නà·?à¶?රයà·? නමà·? à¶?බ à·?à·?දà·?â??යà·?à¶à·? ලà·?පà·?යà¶?à·? à¶?à·?à·?ය යà·?à¶à·?ය %s. à¶?බà¶?à·? පà·?â??රà·?à·?නය පà·?à·?à·?බද à·?à·?à¶?à·?à¶à·?à¶?à·? à¶à·?රà¶à·?රà·? à·?à·?පයà·?මට à¶?à¶à·?à·?à·?à·? à¶?නà·?න, à¶?à·?à·? à¶?බ භà·?à·?à·?à¶à·? à¶?ල පà·?â??රà¶à·?යà·?ජà¶? ලà·?යà·?à·?à·?à¶à·?à·?, à¶?බà¶?à·? à¶?ටà·?ටලයà·? à¶?à·?නà·? නම/à¶?බ භà·?à·?à·?à¶à·? à¶?ල පà·?ටපà¶, Tor à·?à·?à·?à·?නà·? à¶?බ à·?à·?චලබà·?දà·?න පණà·?à·?à·?ඩයනà·? යනà·?දà·?ය à¶?නà·?à¶à¶»à·?à¶?චà¶?රනà·?න."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "à¶?à·?චරà·?à¶?à·?à·?නà·? භà·?à·?à·?à¶à·? à¶?රයà·? නමà·? , à·?à·?දà·?ලà·?යà·? ජà·?ල à·?à·?ටà·?à·?මà·?à·?ලට à¶?à·?à·?à·?, \"මà¶?à·? ISP à·?à·?à·?à·?නà·? Tor ජà·?ලයට à·?මà·?බනà·?ධ à·?à·?ම à¶?à·?à·?à·?රà¶?ර à¶?à¶.\" යනà·?න à¶?à·?ලà·?à¶?à·? à¶?රනà·?න. à¶?ලà¶?ට à·?à·?à¶à·? ලà·?පà·?නයනà·? à·?රà¶?ට à¶?à¶? බà·?à¶?à·?නà·? à¶?à¶?à¶à·? à¶?රනà·?න.."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "දà·?නට à¶?à·?à·?à·?දà·? à·?à·?à¶à·?à·?à¶?à·? පà·?â??රයà·?ජනය à·?දà·?à·? නà·?මà·?ච"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "à¶?බà¶?à·? බà·?â??රà·?à·?à·?රය Firefox à·?ලට à¶?à·?à·?à·? à¶?රනà·?න "
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "�චන ද���� ටය�ප� �රන�න "
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "ප�ය�ර 1"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "ලබà·?à¶?නà·?න %s Tor බà·?â??රà·?à·?à·?ර à¶?ටà·?ටලය %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "ප�ය�ර 2 "
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ලබà·?à¶?නà·?න%s à·?à·?à¶à·?නà·? %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "ප�ය�ර 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#: lib/bridgedb/templates/index.html:38
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "දà·?නà·? %sTor à·?à·?චà·?à·?à¶à·?නà·? à¶?à¶?à¶à·? à¶?රනà·?න%s"
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po
index e982650..09699ff 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Michelozzo <michalslovak2@xxxxxxxxxxx>, 2013
# Svistwarrior273 <romanbeno273@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-27 09:10+0000\n"
-"Last-Translator: Svistwarrior273 <romanbeno273@xxxxxxxxx>\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Ä?o sú to premostenia?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s premostovacie relé %s sú také relé Toru, ktoré vám pomôžu obchádzať cenzúru."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Potrebujem iný spôsob ako zÃskaÅ¥ premostenia!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ä?alÅ¡Ãm spôsobom zistenia verejných adries mostov je zaslaÅ¥ email (z adries %s alebo %s) na %s s telom správy obsahujúcim riadok 'get bridges'."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Moje premostenia nefungujú! Potrebujem pomoc!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Ak váš Tor nefunguje, mali by ste zaslaÅ¥ email na adresu %s. Pokúste sa zahrnúť vÅ¡etky vám známe fakty, vrátane zoznamu vami využÃvaných mostov, názov/verziu použÃvanej verzie Bundle, vÅ¡etky správy vypÃsané Torom, atÄ?."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Ak chcete využiÅ¥ vyÅ¡Å¡ie uvedené, navÅ¡tÃvte stránku Nastavenia siete vo Vidalii a kliknite na \"Môj ISP blokuje pripojenia k sieti Toru\". Potom postupne pridávajte adresy premostenà jednu za druhou."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Momentálne nie sú dostupné žiadne premostenia."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Aktualizujte váš prehliadaÄ? na Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "NapÃÅ¡te dve slová"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Krok 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "ZÃskajte %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Krok 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ZÃskajte %s premostenia %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Krok 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Teraz %s pridajte premostenia k Toru %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..292dcac
--- /dev/null
+++ b/sk_SK/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sk_SK\n"
+"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/sl/LC_MESSAGES/bridgedb.po b/sl/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..ea09424
--- /dev/null
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sl\n"
+"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/sl_SI/LC_MESSAGES/bridgedb.po b/sl_SI/LC_MESSAGES/bridgedb.po
index 44f7d7c..1d21371 100644
--- a/sl_SI/LC_MESSAGES/bridgedb.po
+++ b/sl_SI/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# marko <mr.marko@xxxxxxxxx>, 2011
-# Nwolfy <nikopavlinek@xxxxxxxxx>, 2014
+# Nwolfy, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-01-25 23:20+0000\n"
-"Last-Translator: Nwolfy <nikopavlinek@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,82 +20,315 @@ msgstr ""
"Language: sl_SI\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1. korak"
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2. korak"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3. korak"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/sn/LC_MESSAGES/bridgedb.po b/sn/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..ba893c0
--- /dev/null
+++ b/sn/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sn\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/so/LC_MESSAGES/bridgedb.po b/so/LC_MESSAGES/bridgedb.po
index 205aa21..369a51e 100644
--- a/so/LC_MESSAGES/bridgedb.po
+++ b/so/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:56+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: so\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/son/LC_MESSAGES/bridgedb.po b/son/LC_MESSAGES/bridgedb.po
index e0f76f4..c802265 100644
--- a/son/LC_MESSAGES/bridgedb.po
+++ b/son/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:43+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: son\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/sq/LC_MESSAGES/bridgedb.po b/sq/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..6b2eba4
--- /dev/null
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sq\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index 2b9046f..722f171 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,82 +18,315 @@ msgstr ""
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/sr@latin/LC_MESSAGES/bridgedb.po b/sr@latin/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..1d2ac94
--- /dev/null
+++ b/sr@latin/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sr@latin\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/st/LC_MESSAGES/bridgedb.po b/st/LC_MESSAGES/bridgedb.po
index 12835fc..896d62d 100644
--- a/st/LC_MESSAGES/bridgedb.po
+++ b/st/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:50+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: st\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/su/LC_MESSAGES/bridgedb.po b/su/LC_MESSAGES/bridgedb.po
index 307339d..3143d19 100644
--- a/su/LC_MESSAGES/bridgedb.po
+++ b/su/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:56+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: su\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 8d4bb80..138c45e 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Petomatick <petomatick@xxxxxxxxxxx>, 2011
# WinterFairy <winterfairy@xxxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-25 14:00+0000\n"
-"Last-Translator: WinterFairy <winterfairy@xxxxxxxxxx>\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Vad är bryggor?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bryggreläer %s är Tor reläer som hjälper dig kringå censurering."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Jag behöver ett alternativt sätt att skaffa bryggor på!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ett annat sätt att hitta publika bryggadresser är genom att skicka ett mail (från en %s eller en %s adress) till %s med raden 'get bridges' ensamt i meddelandetexten."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Mina bryggor fungerar inte! Jag behöver hjälp!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Om Tor inte fungerar för dig, maila på engelska till %s. Försök att inkludera så mycket information om ditt fall som möjligt, inklusive listan över bryggor du använde, Tor-paketets filnamn/version, meddelandet Tor gav dig, osv."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "För att använda ovanstående rader, gå in i Vidalias nätverksinställningar, och välj \"Min internetleverantör blockerar anslutningar till Tor-nätverket\". Lägg sedan till varje bryggadress en åt gången."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Inga bryggor tillgängliga för närvarande"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Uppgradera din webbläsare till Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Skriv in de två orden"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Steg 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Skaffa %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Steg 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Skaffa %s bryggor %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Steg 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Lägg nu till %s bryggorna till Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..7981435
--- /dev/null
+++ b/sw/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/szl/LC_MESSAGES/bridgedb.po b/szl/LC_MESSAGES/bridgedb.po
index a286f82..635aa19 100644
--- a/szl/LC_MESSAGES/bridgedb.po
+++ b/szl/LC_MESSAGES/bridgedb.po
@@ -1,14 +1,14 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-18 12:06+0000\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"
"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"
@@ -18,82 +18,315 @@ msgstr ""
"Language: szl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ta/LC_MESSAGES/bridgedb.po b/ta/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..60ec269
--- /dev/null
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: ta\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/te/LC_MESSAGES/bridgedb.po b/te/LC_MESSAGES/bridgedb.po
index a2f703f..591ca14 100644
--- a/te/LC_MESSAGES/bridgedb.po
+++ b/te/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:45+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: te\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/te_IN/LC_MESSAGES/bridgedb.po b/te_IN/LC_MESSAGES/bridgedb.po
index a5b19fb..2bda39c 100644
--- a/te_IN/LC_MESSAGES/bridgedb.po
+++ b/te_IN/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,82 +18,315 @@ msgstr ""
"Language: te_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index 332b508..c7fa1ab 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -1,5 +1,5 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
@@ -7,11 +7,11 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-04-29 09:24+0000\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"
"Last-Translator: runasand <runa.sandvik@xxxxxxxxx>\n"
-"Language-Team: LANGUAGE <LL@xxxxxx>\n"
+"Language-Team: English (http://www.transifex.com/projects/p/torproject/language/en/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,82 +19,315 @@ msgstr ""
"Language: en\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr "Sorry! Something went wrong with your request."
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[This is an automated message; please do not reply.]"
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr "Here are your bridges:"
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr "Welcome to BridgeDB!"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr "Currently supported transport TYPEs:"
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr "Hey, %s!"
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr "Hello, friend!"
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\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
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\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
msgid "What are bridges?"
msgstr "What are bridges?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridge relays %s are Tor relays that help you circumvent censorship."
+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/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "I need an alternative way of getting bridges!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Another way to find public bridge addresses is to send an email (from a %s or a %s address) to %s with the line 'get bridges' by itself in the body of the mail."
+"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."
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "My bridges don't work! I need help!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, 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
+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
+msgid "Here are your bridge lines:"
+msgstr "Here are your bridge lines:"
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr "Get Bridges!"
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr "Please select options for bridge type:"
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr "Do you need IPv6 addresses?"
+
+#: lib/bridgedb/strings.py:95
#, python-format
+msgid "Do you need a %s?"
+msgstr "Do you need a %s?"
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr "Your browser is not displaying images properly."
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr "Enter the characters from the image above..."
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr "How to start using your bridges"
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "If your Tor doesn't work, you should email %s. Try including as much info about your case as you can, including the list of bridges you used, the bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:111
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "To use the above lines, go to Vidalia's Network settings page, and click \"My ISP blocks connections to the Tor network\". Then add each bridge address one at a time."
+"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
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"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
+msgid "Displays this message."
+msgstr "Displays this message."
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr "Request vanilla bridges."
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr "Request IPv6 bridges."
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr "Request a Pluggable Transport by TYPE."
+
+#: lib/bridgedb/strings.py:127
+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
+msgid "Report a Bug"
+msgstr "Report a Bug"
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr "Source Code"
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr "Changelog"
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr "Contact"
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr "Uh oh, spaghettios!"
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr "There currently aren't any bridges available..."
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Perhaps you should try %s going back %s and choosing a different bridge type!"
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Step %s1%s"
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Step %s2%s"
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Get %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Step %s3%s"
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Now %s add the bridges to Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust give me bridges!"
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr "Advanced Options"
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr "No"
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sY%ses!"
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
diff --git a/tg/LC_MESSAGES/bridgedb.po b/tg/LC_MESSAGES/bridgedb.po
index 862bcfc..30e326b 100644
--- a/tg/LC_MESSAGES/bridgedb.po
+++ b/tg/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:45+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: tg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po
index a8b6727..a0132e3 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# AomNicha <vainilla7@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-07-27 08:50+0000\n"
-"Last-Translator: AomNicha <vainilla7@xxxxxxxxx>\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"
+"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"
@@ -20,82 +19,315 @@ msgstr ""
"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "สะà¸?าà¸?หมายà¸?ึà¸?à¸à¸°à¹?ร"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s สะà¸?าà¸?รีà¹?ลยà¹? %s à¸?ืภTor รีà¹?ลยà¹? à¸?ีà¹?à¸?à¹?วยà¹?หà¹?à¸?ุà¸?สามารหลีà¸?หà¸?ีà¸?ารà¸?รวà¸?สà¸à¸?"
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "à¸?ัà¸?à¸?à¹?à¸à¸?à¸?ารà¸?าà¸?à¹?ลืà¸à¸?à¸à¸·à¹?à¸?à¹?à¸?ืà¹?à¸à¹?à¸?à¹?าà¸?ึà¸?สะà¸?าà¸?"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "à¸à¸µà¸?หà¸?ึà¹?à¸?à¸?à¹?à¸à¸?à¸?าà¸? สำหรัà¸?à¸?à¹?à¸?หาà¸?ีà¹?à¸à¸¢à¸¹à¹?à¸?à¸à¸?สะà¸?าà¸?สาà¸?ารà¸?ะ สามารà¸?à¸?ำà¹?à¸?à¹?à¸?à¹?าà¸?à¸?ารสà¹?à¸?à¸à¸µà¹?มล (à¸?าà¸? %s หรืภà¸?ีà¹?à¸à¸¢à¸¹à¹? %s) à¹?à¸?สูà¹? %s à¸?à¹?วยà¹?สà¹?à¸?à¸?าà¸? \"\n\"à¸?ารà¹?à¸?à¹?าà¸?ึà¸?สะà¸?าà¸?\" ภายà¹?à¸?à¹?à¸?ืà¹?à¸à¸«à¸²à¸?à¸à¸?à¸à¸µà¹?มล"
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "à¸?à¹?à¸à¸?à¸?ารà¸?วามà¸?à¹?วยà¹?หลืภสะà¸?าà¸?à¹?มà¹?à¸?ำà¸?าà¸?"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "à¸?à¹?า Tor à¹?มà¹?à¸?ำà¸?าà¸? à¹?หà¹?à¸?ุà¸?สà¹?à¸?à¸à¸µà¹?มล %s à¸?รà¹?à¸à¸¡à¹?à¸?à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?ีà¹?ยวà¸?ัà¸?สà¸?าà¸?à¸?ารà¸?à¹?à¸?à¸à¸?à¸?ุà¸? รายà¸?ืà¹?à¸à¸?à¸à¸?สะà¸?าà¸?à¸?ีà¹?à¸?ุà¸?à¹?à¸?ยà¹?à¸?à¹? à¸?ัà¸?à¸?ีรายà¸?ืà¹?à¸à¸«à¸£à¸·à¸à¹?วà¸à¸£à¹?à¸?ัà¹?à¸?à¸?ีà¹?à¸?ุà¸?à¹?à¸?ยà¹?à¸?à¹? à¸?à¹?à¸à¸?วามà¸?ีà¹? Tor สà¹?à¸?à¸?ึà¸?à¸?ุà¸? à¹?ละà¸à¸·à¹?à¸?à¹? à¸?ีà¹?à¸?ำà¹?à¸?à¹?à¸?"
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr " à¹?à¸?ืà¹?à¸à¹?à¸?à¹?à¸?าà¸?à¸?ามà¸?ำà¹?à¸?ะà¸?ำà¸?à¹?าà¸?à¸?à¸? à¹?à¸?à¸?ีà¹?à¸?ารà¸?ัà¹?à¸?à¸?à¹?าà¹?à¸?รืà¸à¸?à¹?าย Vidalia à¸?าà¸?à¸?ัà¹?à¸?à¸?ลิà¸?à¸?ีà¹? \"à¹?à¸à¹?à¸à¸ªà¸?ีà¸?à¸à¸?à¸?ัà¸?à¸?ูà¸?à¸?ิà¸?à¸?ัà¹?à¸?à¹?มà¹?à¹?หà¹?à¹?à¸?ืà¹?à¸à¸¡à¸?à¹?à¸à¸?ัà¸?à¹?à¸?รืà¸à¸?à¹?าย\" Tor à¹?ละà¸?à¸?à¹?à¸?ิà¹?มà¸?ีà¹?à¸à¸¢à¸¹à¹?à¸?à¸à¸?สะà¸?าà¸?à¹?à¸?à¹?ละà¸à¸±à¸?ลà¸?à¹?à¸?"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "�ม�มีสะ�า��ี�����า��������ะ�ี�"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "à¸?à¹?วยà¸?รัà¸?รุà¹?à¸?à¹?à¸?ราวà¹?à¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?ุà¸?à¹?à¸?à¹?à¸?à¹?à¸?ลà¹?à¸?à¹?à¸à¸?"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "à¹?หà¹?à¸?ิมà¸?à¹?à¸?ำสà¸à¸?à¸?ำ"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "à¸?ัà¹?à¸?à¸?à¸à¸?à¸?ีà¹? 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "��� %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "à¸?ัà¹?à¸?à¸?à¸à¸?à¸?ีà¹? 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "��� %s สะ�า� %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "à¸?ัà¹?à¸?à¸?à¸à¸?à¸?ีà¹? 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "��ะ�ี� %s �����ิ�มสะ�า����ี� Tor %s �ล�ว"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ti/LC_MESSAGES/bridgedb.po b/ti/LC_MESSAGES/bridgedb.po
index 4318c62..ab1ff44 100644
--- a/ti/LC_MESSAGES/bridgedb.po
+++ b/ti/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:45+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ti\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/tk/LC_MESSAGES/bridgedb.po b/tk/LC_MESSAGES/bridgedb.po
index c714f2a..b39bfee 100644
--- a/tk/LC_MESSAGES/bridgedb.po
+++ b/tk/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:44+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: tk\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index fb2b70f..1a45882 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Tosbaa <conan@xxxxxxxxxxxxx>, 2013
# erg26 <ergungorler@xxxxxxxxx>, 2012
# Sercan AltundaÅ? <>, 2012
@@ -12,10 +11,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-05-08 15:30+0000\n"
-"Last-Translator: volkangezer <volkangezer@xxxxxxxxx>\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"
+"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"
@@ -24,82 +23,315 @@ msgstr ""
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Köprüler nedir?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Köprü aynaları, sansürü aÅ?manızı saÄ?layan %s Tor aktarıcılarıdır."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Köprüleri edinmek için alternatif yola ihtiyacım var'"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Halka açık köprü adreslerini edinmenin bir yolu da, mesaj gövdesinin bir satırında \"get bridges\" yazılı bir e-postayı (Bir %s ya da %s adresinden) %s'e göndermektir."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Köprülerim çalıÅ?mıyor! Yardıma ihtiyacım var!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "EÄ?er Tor çalıÅ?mıyorsa, %s 'e e-posta gönderin. Durumunuz hakkında, kullandıÄ?ınız köprülerin listesi, kullandıÄ?ınız paket sürümü/dosya ismi, Tor'un hata mesajları dahil olmak üzere mümkün olduÄ?unca fazla bilgiyi ekleyin."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Yukarıdaki satırları kullanmak için, Vidalia'nınaÄ? ayarları sayfasına gidip \"Servis saÄ?layıcım Tor aÄ?ına eriÅ?imlerini engelliyor\"a tıklayın. Bundan sonra tüm köprüleri birer birer ekleyin. "
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Å?u an uygun köprü yok."
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Tarayıcınızı Firefox'a güncelleyin."
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "İki kelimeyi yazın"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Adım 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "%s Tor Tarayıcı paketini edinin %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Adım 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "%s köprülerini %s edinin"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Adım 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Å?imdi %s köprüleri Tor'a ekleyin %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index 2b03216..561e284 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -1,18 +1,17 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# ghostishev, 2014
# AVATOR <sclub2018@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-03-13 10:40+0000\n"
-"Last-Translator: ghostishev\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"
+"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"
@@ -21,82 +20,315 @@ msgstr ""
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "Що Ñ?аке Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?ипÑ? мÑ?Ñ?Ñ??"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ð?оÑ?Ñ?и %s Ñ?е Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?и Tor, Ñ?кÑ? допомагаÑ?Ñ?Ñ? обÑ?йÑ?и Ñ?ензÑ?Ñ?Ñ?."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?енÑ? поÑ?Ñ?Ñ?бен алÑ?Ñ?еÑ?наÑ?ивний Ñ?поÑ?Ñ?б оÑ?Ñ?иманнÑ? Ñ?пиÑ?кÑ? моÑ?Ñ?Ñ?в!"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Ð?нÑ?ий Ñ?поÑ?Ñ?б знайÑ?и пÑ?блÑ?Ñ?ний мÑ?Ñ?Ñ? - надÑ?Ñ?лаÑ?и лиÑ?Ñ?а (з адÑ?еÑ?и %s або %s) на %s з одним Ñ?Ñ?дком 'get bridges' в Ñ?Ñ?лÑ? лиÑ?Ñ?а."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "Ð?оÑ? моÑ?Ñ?и не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?! Ð?опоможÑ?Ñ?Ñ?!"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "ЯкÑ?о Tor не пÑ?аÑ?Ñ?Ñ? - напиÑ?Ñ?Ñ?Ñ? %s. Ð?пиÑ?Ñ?Ñ?Ñ? пÑ?облемÑ? Ñ?комога бÑ?лÑ?Ñ? докладно, Ð?ведÑ?Ñ?Ñ? Ñ?пиÑ?ок викоÑ?иÑ?Ñ?аниÑ? моÑ?Ñ?Ñ?в, Ñ?м'Ñ? Ñ?айлÑ? / веÑ?Ñ?Ñ?Ñ?, Ñ?кÑ? ви викоÑ?иÑ?Ñ?овÑ?вали, повÑ?домленнÑ? пÑ?о помилки Ñ?а Ñ?нÑ?е."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Ð?лÑ? викоÑ?иÑ?Ñ?аннÑ? Ñ?Ñ?дкÑ?в виÑ?е, вÑ?дкÑ?ийÑ?е Ñ?Ñ?оÑ?Ñ?нкÑ? Vidalia налаÑ?Ñ?Ñ?ваннÑ? Ð?еÑ?ежÑ?, Ñ? наÑ?иÑ?нÑ?Ñ?Ñ?\n\"Ð?Ñ?й пÑ?овайдеÑ? Ð?нÑ?еÑ?неÑ? блокÑ?Ñ? з'Ñ?днаннÑ? з меÑ?ежеÑ? Tor\". Ð?оÑ?Ñ?м додайÑ?е кожнÑ? адÑ?еÑ?Ñ? моÑ?Ñ?а\nза Ñ?аз."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ð?а Ñ?ей Ñ?аÑ? немаÑ? доÑ?Ñ?Ñ?пниÑ? моÑ?Ñ?Ñ?в"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Ð?новÑ?Ñ?Ñ? ваÑ? бÑ?аÑ?зеÑ? до Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Ð?ведÑ?Ñ?Ñ? два Ñ?лова"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Ð?Ñ?ок 1"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Ð?Ñ?Ñ?имайÑ?е %s пакеÑ? Tor Browser %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Ð?Ñ?ок 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?Ñ?Ñ?имайÑ?е %s моÑ?Ñ?и %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Ð?Ñ?ок 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ТепеÑ? %s додайÑ?е моÑ?Ñ?и в Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/ur/LC_MESSAGES/bridgedb.po b/ur/LC_MESSAGES/bridgedb.po
index 66dd65a..edebefa 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:51+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ur\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ur_PK/LC_MESSAGES/bridgedb.po b/ur_PK/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..842359d
--- /dev/null
+++ b/ur_PK/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,332 @@
+# Translations template for BridgeDB.
+# Copyright (C) 2014 'The Tor Project, Inc.'
+# This file is distributed under the same license as the BridgeDB project.
+#
+# Translators:
+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"
+"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"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 0.9.6\n"
+"Language: ur_PK\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:72
+#, 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 ""
+
+#: lib/bridgedb/strings.py:79
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/uz/LC_MESSAGES/bridgedb.po b/uz/LC_MESSAGES/bridgedb.po
index a20ab66..29f02a8 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# Umidjon Almasov <u.almasov@xxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-10-01 16:28+0000\n"
-"Last-Translator: Umidjon Almasov <u.almasov@xxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
+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
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "Bosqich 1"
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "Bosqich 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "Bosqich 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/ve/LC_MESSAGES/bridgedb.po b/ve/LC_MESSAGES/bridgedb.po
index 7dfa679..aaf5b36 100644
--- a/ve/LC_MESSAGES/bridgedb.po
+++ b/ve/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:52+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: ve\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index 90159d6..d537b69 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -18,82 +18,315 @@ msgstr ""
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:42
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
+#, 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
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/wa/LC_MESSAGES/bridgedb.po b/wa/LC_MESSAGES/bridgedb.po
index 26ffa11..93f7c96 100644
--- a/wa/LC_MESSAGES/bridgedb.po
+++ b/wa/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:54+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: wa\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/wo/LC_MESSAGES/bridgedb.po b/wo/LC_MESSAGES/bridgedb.po
index 09168e5..5ff3dc0 100644
--- a/wo/LC_MESSAGES/bridgedb.po
+++ b/wo/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:55+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: wo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index aec9bc4..401511f 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
# simabull tsai, 2013
# simabull tsai, 2013
# simabull tsai, 2013
@@ -12,10 +11,10 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-06-28 00:10+0000\n"
-"Last-Translator: simabull tsai\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"
+"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"
@@ -24,82 +23,315 @@ msgstr ""
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "ä»?ä¹?æ?¯ç½?æ¡¥ä¸ç»§ï¼?"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s ç½?æ¡¥ä¸ç»§ %s æ?¯ä¸?ç§? Tor ä¸ç»§ï¼?ç?¨äº?帮å?©ç?¨æ?·è§?é?¿å®¡æ?¥ã??"
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "é??è¦?使ç?¨å?¶ä»?è?·å??æ?¹å¼?è?·å??ç½?æ¡¥ï¼?"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "è?·å??å?¬å¼?ç??ç½?æ¡¥å?°å??è¿?æ??ä¸?ç§?æ?¹å¼?ï¼?使ç?¨ %s æ?? %s é?®ç®±å??é??ç?µå?é?®ä»¶è?³ %sï¼?并å?¨é?®ä»¶æ£æ??ä¸å??å?«æ??å?â??get bridgesâ??ã?? "
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "ç½?æ¡¥æ? æ³?æ£å¸¸è¿?è¡?ï¼?æ??é??è¦?帮å?©ï¼?"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "å¦?æ?? Tor æ? æ³?æ£å¸¸è¿?è¡?ï¼?请å??é??ç?µå?é?®ä»¶è?³ %sã??请å?¨é?®ä»¶ä¸æ??ä¾?å°½å?¯è?½è¯¦ç»?ç??ä¿¡æ?¯ï¼?ä¾?å¦?ï¼?使ç?¨ç??ç½?æ¡¥å??表ï¼?æ??ç?¨ç??软件å??æ??件å??/ç??æ?¬ï¼?Tor æ??æ?¾ç¤ºç??ä¿¡æ?¯ç?ç?ã??"
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "å¦?é??使ç?¨ä»¥ä¸?å?°å??ï¼?请æ??å¼? Vidalia ç½?ç»?设置ï¼?é??ä¸â??æ??ç?? ISP é?»æ?¡äº?对 Tor ç½?ç»?ç??è¿?æ?¥\"ï¼?ç?¶å??ä¾?次添å? ç½?æ¡¥å?°å??ã??"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "å½?å??æ? å?¯ç?¨ç??ç½?æ¡¥ä¸ç»§"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "请å°?ä½ ç??æµ?è§?å?¨å??级è?³ Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "请è¾?å?¥å?¾ä¸ç??两个å??è¯?"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "第 1 æ¥"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "è?·å?? %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "第 2 æ¥"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "è?·å?? %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "第 3 æ¥"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ç?°å?¨ %s å°?ç½?桥添å? å?° Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index 6f0264d..594d924 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -1,17 +1,16 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
-# CasperLi_HK <li_waikin@xxxxxxxxxxx>, 2013
+# CasperLi_HK <casper.hk@xxxxxxxxxxx>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-12-18 08:25+0000\n"
-"Last-Translator: CasperLi_HK <li_waikin@xxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,82 +19,315 @@ msgstr ""
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "�麼���"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "æ??é??è¦?å¾?å?°å?¦ä¸?種æ?¹å¼?ä¾?å¾?å?°æ©?ï¼?"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index ccec1bd..05da861 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2014-02-28 16:31+0000\n"
-"Last-Translator: ä¿®é?? å¼µ <cges30901@xxxxxxxxx>\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"
+"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"
@@ -19,82 +18,315 @@ msgstr ""
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+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
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
msgid "What are bridges?"
msgstr "�麼�網��"
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:66
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s 網æ©?ä¸ç¹¼ %s æ?¯ Tor ä¸ç¹¼ï¼?å?¯ä»¥å¹«å?©æ?¨è¦?é?¿å¯©æ?¥ã??"
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr "æ??é??è¦?使ç?¨å?¶ä»?æ?¹å¼?ç?²å??網æ©?ï¼?"
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "ç?²å??å?¬é??ç??網æ©?å?°å??é??æ??å?¦ä¸?種æ?¹å¼?ï¼?使ç?¨ %s æ?? %s é?»å?é?µä»¶ç?¼é??é?»å?é?µä»¶è?³ %sï¼?並å?¨é?µä»¶æ£æ??ä¸å??å?«æ??å?ã??get bridgesã??ã??"
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr "網æ©?ç?¡æ³?æ£å¸¸é??è¡?ï¼?æ??é??è¦?幫å?©ï¼?"
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "å¦?æ??Tor ç?¡æ³?æ£å¸¸é??è¡?ï¼?è«?ç?¼é??é?»å?é?µä»¶è?³ %sã??è«?å?¨é?µä»¶ä¸æ??ä¾?ç?¡å?¯è?½è©³ç´°ç??è¨?æ?¯ï¼?ä¾?å¦?ï¼?使ç?¨ç??網æ©?å??表ï¼?æ??ç?¨ç??è»?é«?å??æª?æ¡?å??稱/ç??æ?¬ï¼?Tor æ??顯示ç??ä¿¡æ?¯ç?ç?ã??"
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "å¦?é??使ç?¨ä»¥ä¸?å?°å??ï¼?è«?æ??é?? Vidalia 網路è¨å®?ï¼?é»?é?¸ã??æ??ç?? ISP é?»æ??äº?å°? Tor 網路ç??é?£æ?¥\"ï¼?ç?¶å¾?ä¾?次添å? 網æ©?å?°å??ã??"
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "ç?®å??ç?¡å?¯ç?¨ç??網æ©?ä¸ç¹¼"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "è«?å°?ä½ ç??ç??覽å?¨å??ç´?ç?º Firefox"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "è«?輸å?¥å??ä¸ç??å?©å??å?®å?"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "第 1 æ¥"
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "ç?²å?? %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
+msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "第 2 æ¥"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr "ç?²å?? %s bridges %s"
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "第 3 æ¥"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "ç?¾å?¨ %s å°?網æ©?æ·»å? å?° Tor %s"
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
+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
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
diff --git a/zu/LC_MESSAGES/bridgedb.po b/zu/LC_MESSAGES/bridgedb.po
index 9187305..1bde4d3 100644
--- a/zu/LC_MESSAGES/bridgedb.po
+++ b/zu/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,15 @@
# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
+# Copyright (C) 2014 'The Tor Project, Inc.'
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Translators:
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n";
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-09-16 17:53+0000\n"
-"Last-Translator: Tor Project <support-team-private@xxxxxxxxxxxxxxxxxxxx>\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"
+"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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -19,82 +18,315 @@ msgstr ""
"Language: zu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
+#. 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"
+#. "Tor"
+#. "Tor Browser"
+#. "TBB"
+#: lib/bridgedb/HTTPServer.py:124
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: lib/bridgedb/strings.py:18
+msgid "[This is an automated message; please do not reply.]"
+msgstr ""
+
+#: lib/bridgedb/strings.py:20
+msgid "Here are your bridges:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:22
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: lib/bridgedb/strings.py:25
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#: lib/bridgedb/strings.py:27
+msgid "Welcome to BridgeDB!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: lib/bridgedb/strings.py:29
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:30
+#, python-format
+msgid "Hey, %s!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:31
+msgid "Hello, friend!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+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
+#, 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
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:48
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
msgstr ""
-#: lib/bridgedb/templates/base.html:34
+#: lib/bridgedb/strings.py:52
#, python-format
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: lib/bridgedb/strings.py:65
+msgid "What are bridges?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:66
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: lib/bridgedb/strings.py:71
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/templates/base.html:40
+#: lib/bridgedb/strings.py:72
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
+"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 ""
-#: lib/bridgedb/templates/base.html:48
+#: lib/bridgedb/strings.py:79
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/templates/base.html:49
+#: lib/bridgedb/strings.py:80
+#, python-format
+msgid "If your Tor doesn't work, you should email %s."
+msgstr ""
+
+#: lib/bridgedb/strings.py:81
+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
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:89
+msgid "Get Bridges!"
+msgstr ""
+
+#: lib/bridgedb/strings.py:93
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:94
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:95
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:99
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: lib/bridgedb/strings.py:100
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: lib/bridgedb/strings.py:104
+msgid "How to start using your bridges"
+msgstr ""
+
+#: lib/bridgedb/strings.py:105
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
+"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/templates/bridges.html:10
+#: lib/bridgedb/strings.py:108
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
+"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
+"the wizard until it asks:"
+msgstr ""
+
+#: lib/bridgedb/strings.py:111
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#: lib/bridgedb/strings.py:114
+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"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: lib/bridgedb/strings.py:122
+msgid "Displays this message."
+msgstr ""
+
+#: lib/bridgedb/strings.py:123
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: lib/bridgedb/strings.py:124
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: lib/bridgedb/strings.py:126
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#: lib/bridgedb/strings.py:127
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:91
+msgid "Report a Bug"
+msgstr ""
+
+#: lib/bridgedb/templates/base.html:93
+msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
+#: lib/bridgedb/templates/base.html:96
+msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
+#: lib/bridgedb/templates/base.html:98
+msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
+#: lib/bridgedb/templates/bridges.html:65
+msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
+#: lib/bridgedb/templates/bridges.html:70
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: lib/bridgedb/templates/bridges.html:71
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: lib/bridgedb/templates/index.html:11
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
+msgid "Step %s1%s"
msgstr ""
#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: lib/bridgedb/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
msgstr ""
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
+#: lib/bridgedb/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: lib/bridgedb/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. 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
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:53
+msgid "Advanced Options"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:89
+msgid "No"
+msgstr ""
+
+#: lib/bridgedb/templates/options.html:90
+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
+#, python-format
+msgid "%sY%ses!"
msgstr ""
-#: lib/bridgedb/templates/index.html:21
+#. 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
#, python-format
-msgid "Now %s add the bridges to Tor %s"
+msgid "%sG%set Bridges"
msgstr ""
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits