[tor-commits] [translation/bridgedb] Update translations for bridgedb
translation at torproject.org
translation at torproject.org
Sat May 17 09:16:31 UTC 2014
commit 0cb98acd6ddfa972e0f73dc3a9cf5f2c562536de
Author: Translation commit bot <translation at torproject.org>
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 at 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 at 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 at openitp.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2014
# allamiro <allamiro at gmail.com>, 2011
# Ù…Øمد الØرقان <malham1 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at hotmail.com>, 2013
# Toni Hermoso Pulido <toniher at softcatala.cat>, 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 at hotmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2013
# Elisa <valhalla at gishpuppy.com>, 2011
# Sanky <gsanky+transifex at gmail.com>, 2011
-# Radog <bensch.radek at gmail.com>, 2013
+# Radog <inactive+Radog at transifex.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2014
# littlegreykida <theinfinitygap at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at live.co.uk>, 2011
# torebjornson <tore.bjornson at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at dena-design.de>, 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2014
# kotkotkot <kotakota at gmail.com>, 2013
# kotkotkot <kotakota at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at me.com>, 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 at me.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at esperanto.org>, 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 at torproject.org>\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 at example.com 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 at hotmail.com>, 2011
# Envite <envite at rolamasao.org>, 2013
-# strel <strelnic at gmail.com>, 2013
-# strel <strelnic at gmail.com>, 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 at rolamasao.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at hotmail.com>, 2014
# José Fabián <ar.jfabian+transifex at gmail.com>, 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 at hotmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2014
# Pablo Lezaeta <prflr88 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at outlook.com>, 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 at outlook.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lavabit.com>, 2013
-# Antxon Baldarra <baldarra at lavabit.com>, 2011, 2012
+# Antxon Baldarra <baldarra at bitmessage.ch>, 2013
+# Antxon Baldarra <baldarra at bitmessage.ch>, 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 at lavabit.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2011
# signal89 <ali.faraji90 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2014
# kalossi <ossikallunki at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>, 2013
# Onizuka, 2013
# mehditaileb <mehditaileb at liberte-info.net>, 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 at gmail.com>\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 at example.com 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 at torproject.org>, 2013
# mehditaileb <mehditaileb at liberte-info.net>, 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2012
# Elifelet <arab.with.nargila at gmail.com>, 2014
# GenghisKhan <genghiskhan at gmx.ca>, 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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2013
+# dlb031, 2013
# Armando Vega <synaan at gmail.com>, 2012
# gogo <trebelnik2 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2013
# vargaviktor <viktor.varga at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at yahoo.com>, 2011
# Francesca Ciceri <madamezou at zouish.org>, 2014
# ironbishop <ironbishop at fsfe.org>, 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 at zouish.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at itokei.info>, 2013
# plazmism <gomidori at live.jp>, 2013
-# msaito <rezoolab at gmail.com>, 2013
+# Masaki Saito <rezoolab at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2014
# soksophea <sksophea at gmail.com>, 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 at open.org.kh>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at drdrb.net>, 2014
# cwt96 <cwt967 at naver.com>, 2012
# Dr.what <javrick6 at naver.com>, 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 at drdrb.net>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at yahoo.com>, 2013
# Weldan Jamili <mweldan at gmail.com>, 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 at yahoo.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2013
# erwindelaat <erwin.de.laat at cleveridge.org>, 2014
# WMRKameleon <info at wmrkameleon.nl>, 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 at cleveridge.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2013
+# yodaa <aron.plotnikowski at cryptolab.net>, 2013
# JerBen <ayurveda63 at gmail.com>, 2012
# bogdrozd <bog.d at gazeta.pl>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2014
# kagazz <lourenxo_619 at hotmail.com>, 2014
# TiagoJMMC <tiagojmmc at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at riseup.net>, 2013
# Augustine <evandro at geocities.com>, 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 at riseup.net>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 2013
+# varnav, 2013
# liquixis <liquixis at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at petr1708/LC_MESSAGES/bridgedb.po b/ru at petr1708/LC_MESSAGES/bridgedb.po
index bdd2f64..c01e607 100644
--- a/ru at petr1708/LC_MESSAGES/bridgedb.po
+++ b/ru at 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 at gmail.com>\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 at 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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at hotmail.com>, 2013
# Svistwarrior273 <romanbeno273 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>, 2011
-# Nwolfy <nikopavlinek at ymail.com>, 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 at ymail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at 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 at gmail.com>\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 at example.com 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 at latin/LC_MESSAGES/bridgedb.po b/sr at latin/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..1d2ac94
--- /dev/null
+++ b/sr at 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 at torproject.org>\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 at 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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at hotmail.com>, 2011
# WinterFairy <winterfairy at riseup.net>, 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 at riseup.net>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at 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 at gmail.com>\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 at example.com 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 at gmail.com>\n"
-"Language-Team: LANGUAGE <LL at li.org>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at operamail.com>, 2013
# erg26 <ergungorler at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at yandex.ua>, 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at torproject.org>\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 at example.com 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 at gmail.com>, 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at 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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\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 at example.com 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 at hotmail.com>, 2013
+# CasperLi_HK <casper.hk at hotmail.com>, 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 at hotmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at gmail.com>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 at lists.torproject.org>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=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 at gmail.com>\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 at example.com 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 ""
More information about the tor-commits
mailing list