[tor-commits] [translation/bridgedb] Update translations for bridgedb
translation at torproject.org
translation at torproject.org
Sat Jul 26 09:46:36 UTC 2014
commit 6981c30bbe973b284806398f0d88d7139626c869
Author: Translation commit bot <translation at torproject.org>
Date: Sat Jul 26 09:46:29 2014 +0000
Update translations for bridgedb
---
ach/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ady/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
af/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ak/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
am/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ar/LC_MESSAGES/bridgedb.po | 20 ++---
arn/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ast/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
az/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
be/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
bg/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
bn/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
bn_IN/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
bo/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
br/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
bs/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ca/LC_MESSAGES/bridgedb.po | 140 +++++++++++++++++++--------------
cs/LC_MESSAGES/bridgedb.po | 18 ++---
csb/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
cv/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
cy/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
da/LC_MESSAGES/bridgedb.po | 144 ++++++++++++++++++++--------------
de/LC_MESSAGES/bridgedb.po | 20 ++---
dz/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
el/LC_MESSAGES/bridgedb.po | 20 ++---
en_GB/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
eo/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
es/LC_MESSAGES/bridgedb.po | 20 ++---
es_AR/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
es_CL/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
es_CO/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
es_MX/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
et/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
eu/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
fa/LC_MESSAGES/bridgedb.po | 20 ++---
fi/LC_MESSAGES/bridgedb.po | 20 ++---
fil/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
fo/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
fr/LC_MESSAGES/bridgedb.po | 20 ++---
fr_CA/LC_MESSAGES/bridgedb.po | 20 ++---
fur/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
fy/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ga/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
gl/LC_MESSAGES/bridgedb.po | 138 +++++++++++++++++++--------------
gu/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
gu_IN/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
gun/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ha/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
he/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
hi/LC_MESSAGES/bridgedb.po | 18 ++---
hr/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
hr_HR/LC_MESSAGES/bridgedb.po | 20 ++---
ht/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
hu/LC_MESSAGES/bridgedb.po | 22 +++---
hy/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
hy_AM/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ia/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
id/LC_MESSAGES/bridgedb.po | 18 ++---
is/LC_MESSAGES/bridgedb.po | 18 ++---
it/LC_MESSAGES/bridgedb.po | 138 +++++++++++++++++++--------------
ja/LC_MESSAGES/bridgedb.po | 142 ++++++++++++++++++++--------------
jv/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ka/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
kk/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
km/LC_MESSAGES/bridgedb.po | 20 ++---
kn/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ko/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ko_KR/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ku/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
kw/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ky/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
lb/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
lg/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ln/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
lo/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
lt/LC_MESSAGES/bridgedb.po | 18 ++---
lv/LC_MESSAGES/bridgedb.po | 20 ++---
mg/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
mi/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
mk/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ml/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
mn/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
mr/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ms_MY/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
mt/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
my/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
nah/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
nap/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
nb/LC_MESSAGES/bridgedb.po | 138 +++++++++++++++++++--------------
nds/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ne/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
nl/LC_MESSAGES/bridgedb.po | 146 ++++++++++++++++++++---------------
nl_BE/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
nn/LC_MESSAGES/bridgedb.po | 18 ++---
nso/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
oc/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
or/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
pa/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
pap/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
pl/LC_MESSAGES/bridgedb.po | 20 ++---
pms/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ps/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
pt/LC_MESSAGES/bridgedb.po | 20 ++---
pt_BR/LC_MESSAGES/bridgedb.po | 20 ++---
ro/LC_MESSAGES/bridgedb.po | 22 +++---
ru/LC_MESSAGES/bridgedb.po | 20 ++---
ru at petr1708/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
scn/LC_MESSAGES/bridgedb.po | 18 ++---
sco/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
si_LK/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
sk/LC_MESSAGES/bridgedb.po | 18 ++---
sk_SK/LC_MESSAGES/bridgedb.po | 20 ++---
sl/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
sl_SI/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
sn/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
so/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
son/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
sq/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
sr/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
sr at latin/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
st/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
su/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
sv/LC_MESSAGES/bridgedb.po | 20 ++---
sw/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
szl/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ta/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
te/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
te_IN/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
templates/bridgedb.pot | 136 ++++++++++++++++++--------------
tg/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
th/LC_MESSAGES/bridgedb.po | 18 ++---
ti/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
tk/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
tr/LC_MESSAGES/bridgedb.po | 20 ++---
uk/LC_MESSAGES/bridgedb.po | 142 ++++++++++++++++++++--------------
ur/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
ur_PK/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
uz/LC_MESSAGES/bridgedb.po | 136 ++++++++++++++++++--------------
ve/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
vi/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
wa/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
wo/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
zh_CN/LC_MESSAGES/bridgedb.po | 20 ++---
zh_HK/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
zh_TW/LC_MESSAGES/bridgedb.po | 20 ++---
zu/LC_MESSAGES/bridgedb.po | 134 +++++++++++++++++++-------------
146 files changed, 9455 insertions(+), 6695 deletions(-)
diff --git a/ach/LC_MESSAGES/bridgedb.po b/ach/LC_MESSAGES/bridgedb.po
index e66451f..ea5d240 100644
--- a/ach/LC_MESSAGES/bridgedb.po
+++ b/ach/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Acoli (http://www.transifex.com/projects/p/torproject/language/ach/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ady/LC_MESSAGES/bridgedb.po b/ady/LC_MESSAGES/bridgedb.po
index 90374d0..2782953 100644
--- a/ady/LC_MESSAGES/bridgedb.po
+++ b/ady/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Adyghe (http://www.transifex.com/projects/p/torproject/language/ady/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/af/LC_MESSAGES/bridgedb.po b/af/LC_MESSAGES/bridgedb.po
index c6a9d12..1296db7 100644
--- a/af/LC_MESSAGES/bridgedb.po
+++ b/af/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Afrikaans (http://www.transifex.com/projects/p/torproject/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ak/LC_MESSAGES/bridgedb.po b/ak/LC_MESSAGES/bridgedb.po
index c34bbdd..5a8251f 100644
--- a/ak/LC_MESSAGES/bridgedb.po
+++ b/ak/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Akan (http://www.transifex.com/projects/p/torproject/language/ak/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/am/LC_MESSAGES/bridgedb.po b/am/LC_MESSAGES/bridgedb.po
index c476eb6..771ade9 100644
--- a/am/LC_MESSAGES/bridgedb.po
+++ b/am/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Amharic (http://www.transifex.com/projects/p/torproject/language/am/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index 9fd4f2f..fc410f0 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -17,9 +17,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-20 05:50+0000\n"
-"Last-Translator: Sherief Alaa <sheriefalaa.w at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -82,7 +82,7 @@ msgstr "مرØبا، %s "
msgid "Hello, friend!"
msgstr "مرØبا ,صديقي!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Ù…ÙØ§ØªÙŠØ Ø¹Ø§Ù…Ø©"
@@ -150,8 +150,8 @@ msgstr "Ø£Øتاج إلى وسيلة بديلة للØصول على bridges!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "وكطريقة أخري للØصول علي bridges هو ان ترسل بريد الكتروني إلي %s. يرجى ملاØظة أنه يجب إرسال البريد الإلكتروني باستخدام عنوان من Ø£Øد مزودي خدمات البريد الإلكتروني التاليين: %s او %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -263,19 +263,19 @@ msgstr "أطلب Pluggable Transport بـ TYPE"
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "اØصل على نسخة من Ù…ÙØªØ§Ø GnuPG العام الخاص بـBridgeDB"
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "ابلغ عن خطأ بالبرنامج"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "كود البرنامج"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "التغييرات"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "اتصل بنا"
diff --git a/arn/LC_MESSAGES/bridgedb.po b/arn/LC_MESSAGES/bridgedb.po
index 5af6d86..0fc785c 100644
--- a/arn/LC_MESSAGES/bridgedb.po
+++ b/arn/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Mapudungun (http://www.transifex.com/projects/p/torproject/language/arn/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ast/LC_MESSAGES/bridgedb.po b/ast/LC_MESSAGES/bridgedb.po
index 6a41f1c..4f3976b 100644
--- a/ast/LC_MESSAGES/bridgedb.po
+++ b/ast/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Asturian (http://www.transifex.com/projects/p/torproject/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Non"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/az/LC_MESSAGES/bridgedb.po b/az/LC_MESSAGES/bridgedb.po
index 0711585..c06b8ff 100644
--- a/az/LC_MESSAGES/bridgedb.po
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Xeyr"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po
index c35e4c0..7d1af87 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Belarusian (http://www.transifex.com/projects/p/torproject/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po
index 3068ed0..ad09443 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Bulgarian (http://www.transifex.com/projects/p/torproject/language/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ðе"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index 1a90624..d7743b9 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Bengali (http://www.transifex.com/projects/p/torproject/language/bn/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/bn_IN/LC_MESSAGES/bridgedb.po b/bn_IN/LC_MESSAGES/bridgedb.po
index f7b4e24..0f2e754 100644
--- a/bn_IN/LC_MESSAGES/bridgedb.po
+++ b/bn_IN/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Bengali (India) (http://www.transifex.com/projects/p/torproject/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/bo/LC_MESSAGES/bridgedb.po b/bo/LC_MESSAGES/bridgedb.po
index 180b59a..cf1d442 100644
--- a/bo/LC_MESSAGES/bridgedb.po
+++ b/bo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Tibetan (http://www.transifex.com/projects/p/torproject/language/bo/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/br/LC_MESSAGES/bridgedb.po b/br/LC_MESSAGES/bridgedb.po
index f846390..bfc0901 100644
--- a/br/LC_MESSAGES/bridgedb.po
+++ b/br/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Breton (http://www.transifex.com/projects/p/torproject/language/br/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Petra eo ar pontoù ?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/bs/LC_MESSAGES/bridgedb.po b/bs/LC_MESSAGES/bridgedb.po
index cd16e40..c1a968e 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Bosnian (http://www.transifex.com/projects/p/torproject/language/bs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ne"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po
index 745c189..71eb1e5 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Illenc <provisionalib at hotmail.com>, 2013
-# ELOI95, 2014
+# Albert <provisionalib at hotmail.com>, 2013
+# Eloi GarcÃa i Fargas, 2014
# Humbert <humbert.costas at gmail.com>, 2014
# 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/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-02 09:42+0000\n"
-"Last-Translator: Humbert <humbert.costas at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -24,19 +24,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "Perdoni! Quelcom ha anat malament amb la seva petició."
@@ -60,39 +57,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combina COMMANDs per especificar les múltiples opcions simultà niament)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "Benvingut a BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "Actualment suportant transport TYPEs:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "Ei, %s!"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "Hola, amic!"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Claus Públiques"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martà i espurnes\nper %s a %s en %s."
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
"\n"
msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque pot provocar ofuscacions a la teva connexió a Tor Network, fent-ho més difÃcil per a qualsevol veient el teu trà fic de connexió a internet de determinar que està s\nusant Tor.\n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Què són els ponts?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Necessit una manera alternativa d'obtenir ponts"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "No em funcionen els ponts! Ajuda!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Si el teu Tor no funciona, hauries d'enviar un correu a %s."
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "Si us plau, sel·leccioni les opcions pel tipus de pont:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "Necessites adreces IPv6?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "Necessites un %s?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "El seu navegador no està mostrant les imatges correctament."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "Introdueixi els carà cters de la imatge superior..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "Mostra aquest missatge."
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "Demanar ponts està ndard."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "Demanar ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "Demanar un Pluggable Transport per TYPE."
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Fer una còpia de la clau pública GnuPG del BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Comunicar un Bug"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Codi font"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Canviar el log"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contacte"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "Ueeeee, spaghetiiiiis!!!!"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "No hi han ponts disponibles en aquests moments..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "Ara %s adjunta els ponts al Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sust donem els meus bridges!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "Opcions Avançades"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "No"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "Cap"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -330,7 +354,7 @@ msgstr "%sY%ses!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 09d2633..a013046 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-29 13:31+0000\n"
-"Last-Translator: mxsedlacek\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -77,7 +77,7 @@ msgstr "Hey, %s!"
msgid "Hello, friend!"
msgstr "Ahoj, pÅ™Ãteli!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "VeÅ™ejné klÃÄe"
@@ -145,7 +145,7 @@ msgstr "Chci mosty zjistit jiným způsobem!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -258,19 +258,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Nahlásit chybu"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Zdrojový kód"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Seznam změn"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
diff --git a/csb/LC_MESSAGES/bridgedb.po b/csb/LC_MESSAGES/bridgedb.po
index 6ed0972..a71350f 100644
--- a/csb/LC_MESSAGES/bridgedb.po
+++ b/csb/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Kashubian (http://www.transifex.com/projects/p/torproject/language/csb/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/cv/LC_MESSAGES/bridgedb.po b/cv/LC_MESSAGES/bridgedb.po
index b258f89..655bae9 100644
--- a/cv/LC_MESSAGES/bridgedb.po
+++ b/cv/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Дима <rastamaf at gmail.com>, 2014
+# Хăйчикки <rastamaf at gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Chuvash (http://www.transifex.com/projects/p/torproject/language/cv/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Мĕнле кĕперÑем?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Мана урăх çул кĕпер тĕрекĕÑем кирлĕ!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Çук"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/cy/LC_MESSAGES/bridgedb.po b/cy/LC_MESSAGES/bridgedb.po
index 8415688..65fd00d 100644
--- a/cy/LC_MESSAGES/bridgedb.po
+++ b/cy/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# huwwaters <huwwaters at gmail.com>, 2014
+# Huw Waters <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/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Welsh (http://www.transifex.com/projects/p/torproject/language/cy/)\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Beth yw pontydd?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Rwyf yn angen ffordd arall i cael gafael ar pontydd!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Nid yw fy mhontydd yn gweithio! Rwyf yn angen help!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Na"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po
index 4143b67..e74f8f5 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -3,17 +3,17 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# autofunk78 <villum at autofunk.dk>, 2014
-# DavidNielsen <gnomeuser at gmail.com>, 2014
+# Christian Villum <villum at autofunk.dk>, 2014
+# David Nielsen <gnomeuser at gmail.com>, 2014
# OliverMller <theoliver at live.co.uk>, 2011
-# torebjornson <tore.bjornson at gmail.com>, 2013
+# Tore Bjørnson <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/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-21 19:03+0000\n"
-"Last-Translator: autofunk78 <villum at autofunk.dk>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -24,19 +24,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "Undskyld, noget gik galt med din anmodning."
@@ -60,39 +57,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (Kombiner COMMANDs for at specifierer adskillige valgmuligheder på en gang)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "Velkommen til BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "Transport TYPEs som er understøttet i øjeblikket:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "Hej %s!"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "Hej min ven!"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Offentlige nøgler"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "Denne email til %s blev skabt ved hjælp af regnbuer, enhjørninger og glitter %s klokken %s."
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
"\n"
msgstr "BridgeDB kan formidle broer med adskillige typer %sPluggable Transports%s som kan hjælpe med at sløre dine forbindelser til Tor netværket, og dermed gøre det vanskeligere for nogen som kan se din internet trafik at bestemme at du bruger Tor.\n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr "Nogle broer med IPv6 adresser er også tilgængelige, men ikke alle Pluggable\nTransports understøtter IPv6.\n\n"
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
"\n"
msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen Pluggable Transports %s hvilket måske ikke lyder så smart, men de kan stadigvæk hjælpe med at omgå internet censur i mange tilfælde.\n"
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Hvad er broer?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s broer %s er Tor relæer som hjælper dig med at omgå censur."
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Jeg har brug for en alternativ metode til at få broer på!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "En anden måde at finde broer er at sende en email til %s. Bemærk venligst at du skal\nsende emailen fra en konto hos en af de følgende email udbydere:\n%s eller %s."
+"%s, %s or %s."
+msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Mine broer virker ikke! Jeg har brug for hjælp!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Hvis Tor ikke virker for dig kan du sende en email til %s."
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Prøv at inkluderer så meget information om din sag som muligt, der i blandt: En liste af broer og Pluggable Transports du har prøvet at bruge, din Tor Browser version, hvilke beskeder Tor gav, etc."
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr "Her er dine bro linjer:"
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "Find broer!"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "Vælg venligst brotype muligheder:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "Har du brug for IPv6 adresser?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "Har du brug for en %s?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "Din browser kan ikke vise billeder korrekt."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "Indtast tegnene fra billedet ovenfor..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "SÃ¥dan starter du med at bruge dine broer"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr "For at tilføje broer til Tor Browseren, følg instruktionerne på %s Tor\nBrowserens hjemmeside %s for at starte Tor Browser."
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Når 'Tor netværksindstillinger' vinduet popper op, klik 'Indstil' og følg guiden til den siger:"
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokerer eller på anden vis censurerer din internetudbyder forbindelser\ntil Tor netværket?"
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Vælg 'Ja' og klik så på 'Næste'. For at konfigurere dine nye broer, kopier og indsæt brolinierne i den næste input boks. Klik til sidst 'Forbind', og så er du klar! Hvis du støder på problemer, så prøv at klikke på 'Hjælp'-knappen i 'Tor Netværksindstillinger'-guiden for at få yderligere hjælp."
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "Vis denne besked."
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "Anmod almindelige broer."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "Amod IPv6 broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "Anmod om Pluggable Transport efter TYPE."
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hent en kopi af BridgeDB's offentlige GnuPG nøgle."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Rapporter en fejl"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Kildekode"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Ændringer"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "Ups, vi står i lort til halsen"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "Der er i øjeblikket ingen tilgængelige broer..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "Tilføj nu %s broer til Tor Browseren %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%sare giv mig bridges!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "Advancerede indstillinger"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Nej"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "ingen"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -330,7 +354,7 @@ msgstr "%sJ%sa!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sent Bridges"
diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po
index 5f447f2..765d219 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-02 14:31+0000\n"
-"Last-Translator: Tobias Bannert\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -77,7 +77,7 @@ msgstr "Hallo, %s!"
msgid "Hello, friend!"
msgstr "Hallo Freund!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Öffentliche Schlüssel"
@@ -145,8 +145,8 @@ msgstr "Ich brauche einen alternativen Weg, um Brücken zu erhalten!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Eine weitere Möglichkeit, um Brücken zu erhalten, ist eine E-Mail an %s zu senden. \nBitte beachte Sie, dass Sie die E-Mail von einem der folgenden E-Mail-Anbieter versenden: \n%s oder %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -258,19 +258,19 @@ msgstr "Einen anschließbaren Transporttypen nach Typ anfordern."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Einen Fehler melden"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Quellcode"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Änderungsprotokoll"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
diff --git a/dz/LC_MESSAGES/bridgedb.po b/dz/LC_MESSAGES/bridgedb.po
index a7428b8..68a644e 100644
--- a/dz/LC_MESSAGES/bridgedb.po
+++ b/dz/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Dzongkha (http://www.transifex.com/projects/p/torproject/language/dz/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po
index e20412b..864c1f2 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-16 22:10+0000\n"
-"Last-Translator: isv31 <ix4svs at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -79,7 +79,7 @@ msgstr "Γειά σου, %s!"
msgid "Hello, friend!"
msgstr "Γεια σου, φίλε!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Δημόσια Κλειδιά"
@@ -147,8 +147,8 @@ msgstr "ΧÏειάζομαι Îναν εναλλακτικό Ï„Ïόπο για
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Εναλλακτικά, για να μάθετε γÎφυÏες, στείλτε email στο %s. Σημείωση: Το email Ï€ÏÎπει να σταλεί χÏησιμοποιώντας Îναν από τους παÏακάτω παÏόχους:\n%s ή %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "Ζητήστε Îνα Pluggable Transport βάσει TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Λάβετε Îνα αντίγÏαφο του δημοσίου GnuPG ÎºÎ»ÎµÎ¹Î´Î¹Î¿Ï Ï„Î¿Ï… BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "ΑναφοÏά Î Ïοβλήματος"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Πηγαίος Κώδικας"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "ΑÏχείο καταγÏαφής αλλαγών"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Επαφή"
diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 5ec2fe8..ce66c87 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# richardshaylor <rshaylor at me.com>, 2014
+# Richard Shaylor <rshaylor at me.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik 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"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "What are bridges?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "I need an alternative way of getting bridges!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "My bridges don't work! I need help!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "No"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/eo/LC_MESSAGES/bridgedb.po b/eo/LC_MESSAGES/bridgedb.po
index a03e0fe..fba63b7 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 6262ed6..74d66d1 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-08 23:10+0000\n"
-"Last-Translator: Paola Falcon <cacoepy at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -78,7 +78,7 @@ msgstr "¡Eh, %s!"
msgid "Hello, friend!"
msgstr "¡Hola amigo!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Claves públicas"
@@ -146,8 +146,8 @@ msgstr "¡Necesito un modo alternativo de conseguir puentes!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Otra forma de obtener bridges es enviar un correo a %s. Por favor observe que debe\nenviar el correo electrónico usando una dirección de uno de los siguientes proveedores\nde correo electrónico:\n%s o %s"
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -259,19 +259,19 @@ msgstr "Solicitar un Pluggable Transport por TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtener una copia de la clave pública GnuPG de BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Reportar una falla"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Código fuente"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Registro de cambios"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contactar"
diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 1b2d1b8..1a35c8c 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/projects/p/torproject/language/es_AR/)\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "¿Qué son los puentes de red?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito una manera alternativa de obtener puentes!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "¡Mis puentes no funcionan! Necesito ayuda!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/es_CL/LC_MESSAGES/bridgedb.po b/es_CL/LC_MESSAGES/bridgedb.po
index 3c0bd03..c4bf601 100644
--- a/es_CL/LC_MESSAGES/bridgedb.po
+++ b/es_CL/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,13 @@
#
# Translators:
# halbares <pablo.alvarez.flores at gmail.com>, 2014
-# Pablo Lezaeta <prflr88 at gmail.com>, 2014
+# Pablo Roberto Francisco Lezaeta Reyes <prflr88 at gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Spanish (Chile) (http://www.transifex.com/projects/p/torproject/language/es_CL/)\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "¿Cuáles son los puentes?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito una forma alternativa de obtener puentes!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "¡Mi puente no funciona! ¡Ayúdenme!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 28e7c0c..ca0a54b 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/projects/p/torproject/language/es_CO/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po
index 70872ae..0ed9afb 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/projects/p/torproject/language/es_MX/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
index 5698270..102f4e4 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Estonian (http://www.transifex.com/projects/p/torproject/language/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ei"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index 9c243df..6da4093 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -9,8 +9,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Zer dira zubiak?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ez"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index 3c1c2fc..e4cc82d 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-25 05:10+0000\n"
-"Last-Translator: Mohammad Hossein <desmati at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -79,7 +79,7 @@ msgstr "سلام، %s!"
msgid "Hello, friend!"
msgstr "سلام دوست من!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Public Key ها"
@@ -147,8 +147,8 @@ msgstr "به یک راه دیگر برای دریاÙت bridge ها اØتیاج
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "یک راه دیگر برای دریاÙت پل ها ارسال ایمیل به آدرس %s است. توجه کنید ایمیلی Ú©Ù‡ ارسال Ù…ÛŒ کنید، Øتماً از طریق یکی از شرکت های زیر باشد:\n%s یا %s"
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "درخواست یک روش Transport جایگزین براساس TYPE"
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "دریاÙت یک Ú©Ù¾ÛŒ از کلید عمومی BridgeDB"
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "گزارش یک باگ"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "کد منبع"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "لیست تغییرات"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "تماس"
diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po
index e859271..ff050b7 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-19 07:40+0000\n"
-"Last-Translator: karvjorm <karvonen.jorma at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -76,7 +76,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Hei ystävä!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Julkiset avaimet"
@@ -144,8 +144,8 @@ msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoitteeseen %s. Huomaa,\nettä sinun on lähetettävä sähköpostiviesti käyttäen yhtä seuraavien sähköpostitarjoajien\nosoitetta:\n%s tai %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "Pyydä TYPE-tyyppistä irrotettavaa Pluggable Transport-siirtoa."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Ilmoita ohjelmointivirheestä"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Lähdekoodi"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Muutosloki"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Yhteystieto"
diff --git a/fil/LC_MESSAGES/bridgedb.po b/fil/LC_MESSAGES/bridgedb.po
index cc9b0a7..6633142 100644
--- a/fil/LC_MESSAGES/bridgedb.po
+++ b/fil/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Wala"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/fo/LC_MESSAGES/bridgedb.po b/fo/LC_MESSAGES/bridgedb.po
index 26dcd04..a289188 100644
--- a/fo/LC_MESSAGES/bridgedb.po
+++ b/fo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Faroese (http://www.transifex.com/projects/p/torproject/language/fo/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 05ff96d..696487f 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-02 02:59+0000\n"
-"Last-Translator: fayçal fatihi <ofaycal.geo.x at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -83,7 +83,7 @@ msgstr "Salut, %s!"
msgid "Hello, friend!"
msgstr "Bonjour, ami !"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Les clés publiques"
@@ -151,8 +151,8 @@ msgstr "J'ai besoin d'une alternative pour obtenir des adresses de bridges !"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Une autre alternative pour obtenir bridges est d'envoyer un email à %s. Veuillez noter que vous devez envoyer un email en utilisant une adresse email d'un des fournisseurs d'accès suivant: %s ou %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -264,19 +264,19 @@ msgstr "Demander un Pluggable Transport par TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtenir une copie de la clef GnuPG publique BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Faire un rapport de Bug"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Le code source"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Changelog"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contact"
diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po
index 01a5ee7..6612a42 100644
--- a/fr_CA/LC_MESSAGES/bridgedb.po
+++ b/fr_CA/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-19 17:51+0000\n"
-"Last-Translator: yahoe.001\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -76,7 +76,7 @@ msgstr "Allô, %s!"
msgid "Hello, friend!"
msgstr "Bonjour l'ami!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Clefs publiques"
@@ -144,8 +144,8 @@ msgstr "J'ai besoin d'une alternative pour obtenir des ponts!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez utiliser une adresse d'un des fournisseurs de courriel suivants :\n%s ou %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "Demander un transport enfichable par TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtenir une copie de la clef GnuPG publique de BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Rapporter un bogue"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Code source"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Journal des changements"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contact"
diff --git a/fur/LC_MESSAGES/bridgedb.po b/fur/LC_MESSAGES/bridgedb.po
index fa4d87d..ef58357 100644
--- a/fur/LC_MESSAGES/bridgedb.po
+++ b/fur/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Friulian (http://www.transifex.com/projects/p/torproject/language/fur/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/fy/LC_MESSAGES/bridgedb.po b/fy/LC_MESSAGES/bridgedb.po
index fa490fd..554c090 100644
--- a/fy/LC_MESSAGES/bridgedb.po
+++ b/fy/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Western Frisian (http://www.transifex.com/projects/p/torproject/language/fy/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ga/LC_MESSAGES/bridgedb.po b/ga/LC_MESSAGES/bridgedb.po
index 4cdd4da..6ba84b1 100644
--- a/ga/LC_MESSAGES/bridgedb.po
+++ b/ga/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Irish (http://www.transifex.com/projects/p/torproject/language/ga/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/gl/LC_MESSAGES/bridgedb.po b/gl/LC_MESSAGES/bridgedb.po
index 23ed1c6..8601024 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -4,15 +4,15 @@
#
# Translators:
# manuel meixide <m.meixide at gmail.com>, 2013
-# mbouzada <mbouzada at gmail.com>, 2013
+# Miguel Anxo Bouzada <mbouzada at gmail.com>, 2013
# pepepenha <pepepenha at hotmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-20 17:52+0000\n"
-"Last-Translator: pepepenha <pepepenha at hotmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -23,19 +23,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "SentÃmolo! Algo foi mal coa súa solicitude."
@@ -59,39 +56,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,14 +103,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -117,96 +125,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Que son os repetidores ponte?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Eu necesito un xeito alternativo de obter pontes!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "As miñas pontes non funcionan! Necesito axuda!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -214,52 +230,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -300,28 +325,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Non"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -329,7 +353,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/gu/LC_MESSAGES/bridgedb.po b/gu/LC_MESSAGES/bridgedb.po
index 51e37ab..9f0c183 100644
--- a/gu/LC_MESSAGES/bridgedb.po
+++ b/gu/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Gujarati (http://www.transifex.com/projects/p/torproject/language/gu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/gu_IN/LC_MESSAGES/bridgedb.po b/gu_IN/LC_MESSAGES/bridgedb.po
index c8d8300..6afb06f 100644
--- a/gu_IN/LC_MESSAGES/bridgedb.po
+++ b/gu_IN/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Gujarati (India) (http://www.transifex.com/projects/p/torproject/language/gu_IN/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/gun/LC_MESSAGES/bridgedb.po b/gun/LC_MESSAGES/bridgedb.po
index 58e743b..6ee08ea 100644
--- a/gun/LC_MESSAGES/bridgedb.po
+++ b/gun/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Gun (http://www.transifex.com/projects/p/torproject/language/gun/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ha/LC_MESSAGES/bridgedb.po b/ha/LC_MESSAGES/bridgedb.po
index 83d7b2f..b05f3ce 100644
--- a/ha/LC_MESSAGES/bridgedb.po
+++ b/ha/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Hausa (http://www.transifex.com/projects/p/torproject/language/ha/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po
index af179c7..5603c63 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -7,13 +7,13 @@
# Elifelet <arab.with.nargila at gmail.com>, 2014
# GenghisKhan <genghiskhan at gmx.ca>, 2013
# Kunda, 2014
-# Cuvint Chofschy <static.172 at gmail.com>, 2012
+# static172 <static.172 at gmail.com>, 2012
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Hebrew (http://www.transifex.com/projects/p/torproject/language/he/)\n"
"MIME-Version: 1.0\n"
@@ -25,19 +25,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -61,39 +58,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,14 +105,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -119,96 +127,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "×ž×”× ×’×©×¨×™×?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "×× ×™ זקוק לדרך חלופית לקבלת גשרי×!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "×”×’×©×¨×™× ×©×œ×™ ×œ× ×¢×•×‘×“×™×! ×× ×™ זקוק לעזרה!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -216,52 +232,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "דווח על תקלה"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -302,28 +327,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "ל×"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -331,7 +355,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po
index 6cc95d6..bad5b3d 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-15 05:10+0000\n"
-"Last-Translator: b1nKG <bineetkumar at live.in>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr "अरे, %s!"
msgid "Hello, friend!"
msgstr "नमसà¥à¤¤à¥‡, दोसà¥à¤¤!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "सारà¥à¤µà¤œà¤¨à¤¿à¤• कà¥à¤‚जी"
@@ -141,7 +141,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -254,19 +254,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
diff --git a/hr/LC_MESSAGES/bridgedb.po b/hr/LC_MESSAGES/bridgedb.po
index b864b4d..61ba18c 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# anchorsound <anchorsound at gmail.com>, 2014
+# Nikola Parsifal <anchorsound at gmail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Croatian (http://www.transifex.com/projects/p/torproject/language/hr/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ne"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po
index af52bb1..7eb3224 100644
--- a/hr_HR/LC_MESSAGES/bridgedb.po
+++ b/hr_HR/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-30 13:01+0000\n"
-"Last-Translator: Ana B\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -75,7 +75,7 @@ msgstr "Bok, %s!"
msgid "Hello, friend!"
msgstr "Bok, prijatelju!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Javni kljuÄevi"
@@ -143,8 +143,8 @@ msgstr "Trebam alternativni naÄin dobivanja mostova!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "JoÅ¡ jedan naÄin za dobiti mostove je da poÅ¡aljete email na %s. Imajte na umu da morate\nposlati email koristeći adresu jednog od sljedećih email providera:\n%s ili %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -256,19 +256,19 @@ msgstr "Zatraži Pluggable Transport od TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Dobij kopiju BridgeDB javnog GnuPG kljuÄa."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Prijavi Greški"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Izvorni Kod"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Changelog"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
diff --git a/ht/LC_MESSAGES/bridgedb.po b/ht/LC_MESSAGES/bridgedb.po
index 884397c..15c5df1 100644
--- a/ht/LC_MESSAGES/bridgedb.po
+++ b/ht/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Haitian (Haitian Creole) (http://www.transifex.com/projects/p/torproject/language/ht/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po
index d11c31b..6e7dbfe 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Blackywantscookies <gaborcika111 at gmail.com>, 2014
+# Blackywantscookies <gaborcika at citromail.hu>, 2014
# Cerbo <taiurin at gmail.com>, 2014
# vargaviktor <viktor.varga at gmail.com>, 2013
# vargaviktor <viktor.varga at gmail.com>, 2011
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-24 14:51+0000\n"
-"Last-Translator: Blackywantscookies <gaborcika111 at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -76,7 +76,7 @@ msgstr "Hé, %s!"
msgid "Hello, friend!"
msgstr "Hello!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Nyilvános kulcsok"
@@ -144,8 +144,8 @@ msgstr "Szükségem van egy alternatÃv módra a Hidak beszerzéséhez!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Másik módszer hidak beszerzésére email küldésével lehetséges a %s cÃmre. \nKérem vegye figyelembe azt hogy az email küldéséhez használjon egyet az alábbi email szolgáltatók közül. \n%s vagy %s"
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "Egy csatlakoztatható szállÃtó kérelme TYPE szerint."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Másolat szertése a BridgeDB's publikus GnuPG kulcsából."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Hiba jelentése"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Forrás kód"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Változások"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kapcsolat"
diff --git a/hy/LC_MESSAGES/bridgedb.po b/hy/LC_MESSAGES/bridgedb.po
index 09b4ada..c1e99d3 100644
--- a/hy/LC_MESSAGES/bridgedb.po
+++ b/hy/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Armenian (http://www.transifex.com/projects/p/torproject/language/hy/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/hy_AM/LC_MESSAGES/bridgedb.po b/hy_AM/LC_MESSAGES/bridgedb.po
index 5f2cc34..38def8f 100644
--- a/hy_AM/LC_MESSAGES/bridgedb.po
+++ b/hy_AM/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Armenian (Armenia) (http://www.transifex.com/projects/p/torproject/language/hy_AM/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ia/LC_MESSAGES/bridgedb.po b/ia/LC_MESSAGES/bridgedb.po
index 8662940..a7edcf4 100644
--- a/ia/LC_MESSAGES/bridgedb.po
+++ b/ia/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Interlingua (http://www.transifex.com/projects/p/torproject/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "No"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po
index 1a0a909..1841863 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -10,9 +10,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-26 12:41+0000\n"
-"Last-Translator: L1Nus <multazam_ali at me.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -75,7 +75,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
@@ -143,7 +143,7 @@ msgstr "Adakah cara lain untuk memperoleh penghubung?"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -256,19 +256,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index 08555d2..5390c2a 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -72,7 +72,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
@@ -140,7 +140,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -253,19 +253,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po
index ba7d480..c1da40b 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -18,9 +18,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-20 15:51+0000\n"
-"Last-Translator: Paolo Stivanin <paolostivanin at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -31,19 +31,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta."
@@ -67,39 +64,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "Benvenuto/a su BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "Transport TYPEs attualmente supportati:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "Ciao amico!"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Chiavi Pubbliche"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "Questa email è stata generata con arcobaleni, unicorni e scintille\nper %s il %s alle %s."
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,14 +111,20 @@ msgid ""
"\n"
msgstr "BridgeDB può fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiù difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni Pluggable\nTransports non siano compatibili con IPv6.\n\n"
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,96 +133,104 @@ msgid ""
"\n"
msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n"
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Cosa sono i bridge?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura."
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Mi serve un altro modo per avere dei bridge!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Un altro modo per ottenere dei bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando un indirizzo tra uno dei seguenti provider di email:\n%s o %s."
+"%s, %s or %s."
+msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "I miei bridge non funzionano! Mi serve aiuto!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Se Tor non ti funziona, manda un'email a %s."
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Cerca di includere più informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc."
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr "Ecco le tue linee bridge:"
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "Ottieni dei Bridge!"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "Seleziona le opzioni per il tipo di bridge:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "Ti servono indirizzi IPv6?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "Ti serve un %s?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "Il tuo browser non mostra le immagini in modo corretto."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "Inserisci i caratteri nell'immagine sopra..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "Come iniziare a usare i tuoi bridge"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr "Per inserire i bridge nel Tor Browser, segui le istruzioni nella %s pagina\ndi download di Tor Browser %s per avviare Tor Browser."
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Quando appare la finestra delle 'Impostazioni Rete Tor', clicca 'Configura' e\nsegui la procedura giudata finchè non chiede:"
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?"
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -222,52 +238,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Seleziona 'Sì' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza."
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "Mostra questo messaggio."
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "Richiedi bridge vanilla."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "Richiedi bridge IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "Richiedi un Pluggable Transport by TYPE."
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Segnala un Errore"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Codice Sorgente"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Changelog"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contatti"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, spaghettios!"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "Non ci sono bridge disponibili al momento..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -308,28 +333,27 @@ msgstr "Ora %s aggiungi i bridge a Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sD%sammi i bridge e basta!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "Opzioni Avanzate"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "No"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "nessuno"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sì!"
@@ -337,7 +361,7 @@ msgstr "%sS%sì!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sttieni Bridge"
diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po
index 76232ac..4750704 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -4,16 +4,16 @@
#
# Translators:
# brt <87 at itokei.info>, 2013
-# plazmism <gomidori at live.jp>, 2013
-# plazmism <gomidori at live.jp>, 2014
+# ã‚¿ã‚«ãƒã‚· <gomidori at live.jp>, 2013
+# ã‚¿ã‚«ãƒã‚· <gomidori at live.jp>, 2014
# 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/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-03 15:41+0000\n"
-"Last-Translator: plazmism <gomidori at live.jp>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -24,19 +24,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚"
@@ -60,39 +57,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "コマンド: (コマンドを組ã¿åˆã‚ã›ã¦ã€åŒæ™‚ã«è¤‡æ•°ã®ã‚ªãƒ—ションを指定ã™ã‚‹)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB ã¸ã‚ˆã†ã“ãï¼"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るトランスãƒãƒ¼ãƒˆã‚¿ã‚¤ãƒ—:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "ã©ã†ã‚‚ %s ã•ã‚“ï¼"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "ã©ã†ã‚‚ã“ã‚“ã«ã¡ã¯ï¼"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "公開éµ"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯ %s ã« %s %s ã« rainbow åŠã³ unicorn 〠sparkle ã§ç”Ÿæˆã•ã‚Œã¾ã—ãŸã€‚"
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
"\n"
msgstr "BridgeDB ã¯ã€%sタイプ㮠Pluggable Transports%s ã§ãƒ–リッジをæä¾›ã—ã¾ã™ã€‚\nTor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®æŽ¥ç¶šã‚’悟られã¥ã‚‰ãã™ã‚‹ã“ã¨ã«å½¹ç«‹ã¡ã€ã‚ãªãŸã®\nインターãƒãƒƒãƒˆãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚’監視ã—ã¦ã„る誰ã‹ãŒã‚ãªãŸãŒ Tor を使用ã—ã¦ã„ã‚‹ã“ã¨ã‚’判別ã™ã‚‹ã“ã¨ãŒã•ã‚‰ã«é›£ã—ããªã‚Šã¾ã™ã€‚\n\n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr "IPv6 ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ãƒ–リッジも利用ã§ãã‚‹ã‚‚ã®ãŒã‚ã‚Šã¾ã™ãŒã€ Pluggable Transports ã«ã¯ IPv6 ã«äº’æ›æ€§ãŒãªã„ã‚‚ã®ã‚‚ã‚ã‚Šã¾ã™ã€‚\n\n"
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
"\n"
msgstr "åŠ ãˆã¦ã€ BridgeDB ã¯ã€ %s Pluggable Transport %s ã®ãªã„多ãã®ä½•ã®å¤‰å“²ã‚‚ãªã„\n通常ã®ãƒ–リッジをæŒã¡ã€ãã‚Œã¯ã‚¯ãƒ¼ãƒ«ã«ã¯æ€ãˆãªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ã—ã‹ã—ã€å¤šãã®å ´åˆã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæ¤œé–²ã‚’回é¿ã™ã‚‹ã®ã«ãªãŠæœ‰åŠ¹ã§ã™ã€‚\n"
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "ブリッジã¨ã¯ï¼Ÿ"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s ブリッジ %s ã¯ã€ インターãƒãƒƒãƒˆæ¤œé–²ã‚’回é¿ã™ã‚‹åŠ©ã‘ã¨ãªã‚‹ Tor リレーã§ã™ã€‚"
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "ブリッジを得る他ã®æ–¹æ³•ãŒå¿…è¦ã§ã™!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "ブリッジを入手ã™ã‚‹åˆ¥ã®ã‚„り方㯠%s ã¾ã§ãƒ¡ãƒ¼ãƒ«ã‚’é€ã‚‹ã“ã¨ã§ã™ã€‚以下ã®ãƒ¡ãƒ¼ãƒ«ãƒ—ãƒãƒã‚¤ãƒ€ã®ã†ã¡ã®1ã¤ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’使用ã—ã¦ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ãªã‘ã‚Œã°ãªã‚‰ãªã„ã“ã¨ã«ã”注æ„ãã ã•ã„: %s ã¾ãŸã¯ %s"
+"%s, %s or %s."
+msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "ç§ã®ãƒ–リッジãŒå‹•ãã¾ã›ã‚“! 助ã‘ã¦ãã ã•ã„!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Tor ãŒã†ã¾ã動作ã—ãªã„å ´åˆã€ %s ã¾ã§ãƒ¡ãƒ¼ãƒ«ã‚’下ã•ã„。"
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "ã‚ãªãŸãŒä½¿ãŠã†ã¨ã—ãŸãƒ–リッジや Pluggable Transports 〠ã”利用㮠Tor Browser ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã€ãã—㦠Tor ãŒå‡ºåŠ›ã—ãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ç‰ãªã©ã‚’å«ã¿ã€å‡ºæ¥ã‚‹é™ã‚Šã‚ãªãŸã®ã‚±ãƒ¼ã‚¹ã«é–¢ã™ã‚‹å¤šãã®æƒ…å ±ã‚’å«ã‚ã¦ã¿ã¦ãã ã•ã„。"
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr "ã‚ãªãŸã®ãƒ–リッジラインã¯ã“ã¡ã‚‰ã§ã™:"
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "ブリッジを入手ï¼"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "ブリッジタイプã®ã‚ªãƒ—ションをé¸æŠžã—ã¦ãã ã•ã„:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 アドレスãŒå¿…è¦ã§ã™ã‹ï¼Ÿ"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "%s ãŒå¿…è¦ã§ã™ã‹ï¼Ÿ"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "ã”利用ã®ãƒ–ラウザã¯é©åˆ‡ã«ç”»åƒã‚’表示ã—ã¦ã„ã¾ã›ã‚“。"
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "上記ã®ç”»åƒã‹ã‚‰æ–‡å—を入力ã—ã¦ãã ã•ã„..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "ブリッジ使用ã®å§‹ã‚æ–¹"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr "Tor Browser ã«ãƒ–ãƒªãƒƒã‚¸æƒ…å ±ã‚’å…¥åŠ›ã™ã‚‹ã«ã¯ã€ %s Tor Browser ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰ãƒšãƒ¼ã‚¸ %s ã®æŒ‡ç¤ºã«å¾“ã£ã¦ Tor Browser ã‚’èµ·å‹•ã—ã¦ãã ã•ã„。"
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "「Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¨å®šã€ãƒ€ã‚¤ã‚¢ãƒã‚°ãŒãƒãƒƒãƒ—アップã—ãŸéš›ã€è¨å®šã‚’クリックã—ã¦\nèžã‹ã‚Œã‚‹ã¾ã§ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã«å¾“ã£ã¦ãã ã•ã„。"
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "ã”利用ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‚µãƒ¼ãƒ“スプãƒãƒã‚¤ãƒ€ãƒ¼ (ISP) 㯠Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®æŽ¥ç¶šã‚’ブãƒãƒƒã‚¯ãªã„ã—\n別ã®ã‚„ã‚Šæ–¹ã§æ¤œé–²ã—ã¦ã„ã¾ã™ã‹ï¼Ÿ"
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "「ã¯ã„ã€ã‚’é¸æŠžã—ã¦ã€ã€Œæ¬¡ã€ã‚’クリックã—ã¦ãã ã•ã„。新ã—ã„ブリッジを構æˆã™ã‚‹ãŸã‚ã«ã€ãƒ†ã‚スト\n入力ボックスã«ãƒ–リッジラインをコピーペーストã—ã¦ãã ã•ã„。最後ã«ã€ã€ŒæŽ¥ç¶šã€ã‚’クリックã—ã¦ã€\nã•ã‚準備ãŒå‡ºæ¥ãŸã¯ãšã§ã™ï¼ä½•ã‹å•é¡ŒãŒã‚ã£ãŸã‚‰ã€ã•ã‚‰ãªã‚‹åŠ©ã‘ã‚’å¾—ã‚‹ãŸã‚ã«ã€ŒTor\nãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¨å®šã€ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰å†…「ヘルプã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。"
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "ã“ã®ç”»åƒã‚’表示"
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "vanilla ブリッジをリクエスト"
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "IPv6 ブリッジをリクエスト"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "タイプã”ã¨ã« Pluggable Transport をリクエスト"
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB ã® GnuPG 公開éµã®ã‚³ãƒ”ーを手ã«å…¥ã‚Œã¾ã—ょã†ã€‚"
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "ãƒã‚°ã‚’å ±å‘Šã™ã‚‹"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "ソースコード"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "変更履æ´"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "ãŠå•ã„åˆã‚ã›"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "ãŠã£ã¨ã‚¹ãƒ‘ゲッティï¼"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "今ã®æ™‚点ã§ã¯åˆ©ç”¨ã§ãるブリッジãŒã‚ã‚Šã¾ã›ã‚“..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "%s Tor Browser ã«ãƒ–ãƒªãƒƒã‚¸ã‚’è¿½åŠ ã—ã¾ã™ %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sã‚%sã®ã€ãã ã•ã„〠bridges!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "高度ãªè¨å®š"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "ã„ã„ãˆ"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "ãªã—"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sã¯%sã„ï¼"
@@ -330,7 +354,7 @@ msgstr "%sã¯%sã„ï¼"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set Bridges"
diff --git a/jv/LC_MESSAGES/bridgedb.po b/jv/LC_MESSAGES/bridgedb.po
index 6e43864..1a69b22 100644
--- a/jv/LC_MESSAGES/bridgedb.po
+++ b/jv/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Javanese (http://www.transifex.com/projects/p/torproject/language/jv/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po
index 048e06a..d74c57f 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# x0rmia <x0rmia at gmail.com>, 2013
+# George Rommel <x0rmia at gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Georgian (http://www.transifex.com/projects/p/torproject/language/ka/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po
index 3183909..96437cc 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Kazakh (http://www.transifex.com/projects/p/torproject/language/kk/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Көріплер дегеніміз не?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Көпірлер алудың маған баÑқа жолы керек!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Менің көпірлерім Ð¶Ò±Ð¼Ñ‹Ñ Ñ–Ñтемейді! Көмек қажет!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 95a26bc..051c250 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-10 02:50+0000\n"
-"Last-Translator: Sokhem Khoem <sokhem at open.org.kh>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -76,7 +76,7 @@ msgstr "áž áŸ, %s!"
msgid "Hello, friend!"
msgstr "សួស្ដី, មិážáŸ’ážáž—áŸáž€áŸ’ដិ!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "សោ​សាធារណៈ"
@@ -144,8 +144,8 @@ msgstr "ážáŸ’ញុំ​ážáŸ’រូវការ​វិធីសាស្áž
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -257,19 +257,19 @@ msgstr "ស្នើ​ការ​ផ្ទáŸážšâ€‹ážŠáŸ‚ល​អាច​ដ
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Get a copy of BridgeDB's public GnuPG key."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "របាយការណáŸâ€‹áž€áŸ†áž ុស"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "កូដ​ប្រភព"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Changelog"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "ទំនាក់ទំនង"
diff --git a/kn/LC_MESSAGES/bridgedb.po b/kn/LC_MESSAGES/bridgedb.po
index ec8c3d1..30ff5c6 100644
--- a/kn/LC_MESSAGES/bridgedb.po
+++ b/kn/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,13 @@
#
# Translators:
# msj2, 2013
-# msj2, 2013
+# MSJ, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "ಬà³à²°à²¿à²¡à³à²œà³ ಗಳೠಅಂದರೆ à²à²¨à³?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "ನನಗೆ ಬà³à²°à²¿à²¡à³à²œà³â€Œà²—ಳೠಸಿಗà³à²µ ಬದಲಿ ಮಾರà³à²— ಬೇಕà³"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "ನನà³à²¨ ಬà³à²°à²¿à²¡à³à²œà³â€Œà²—ಳೠಕೆಲಸ ಮಾಡà³à²¤à²¿à²²à³à²². ಸಹಾಯ ಮಾಡಿ"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "ಇಲà³à²²"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index 493c851..b771f0a 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-24 07:11+0000\n"
-"Last-Translator: ilbe123 <a3057016 at drdrb.net>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -25,19 +25,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "죄송합니다! ë‹¹ì‹ ì˜ ìš”ì²ì— 무언가 ë¬¸ì œê°€ 있습니다."
@@ -61,39 +58,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB ì— ì˜¤ì‹ ê²ƒì„ í™˜ì˜í•©ë‹ˆë‹¤!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "공개 키"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,14 +105,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -119,96 +127,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "'브릿지'란?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "브릿지를 얻는 다른 ë°©ë²•ì´ ì—†ì„까요?"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "브릿지가 ë§›ì´ ê°”ì–´ìš”! ë„와줘요!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "브릿지를 얻으세요!"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "브릿지 ì¢…ë¥˜ì— ê´€í•œ ì˜µì…˜ì„ ê³¨ë¼ ì£¼ì„¸ìš”:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 주소가 필요합니까?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "%s 가 필요합니까?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "ë‹¹ì‹ ì˜ ë¸Œë¼ìš°ì €ëŠ” ì‚¬ì§„ì„ ì •ìƒì 으로 불러오지 못합니다."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "브릿지를 사용하는 방법"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -216,52 +232,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "ì´ ë©”ì„¸ì§€ë¥¼ 표시하기"
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "ë°”ë‹ë¼ 브릿지를 ìš”ì²í•©ë‹ˆë‹¤."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "IPv6 브릿지를 ìš”ì²í•©ë‹ˆë‹¤."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDBì˜ ê³µê°œ GnuPG 키를 얻습니다."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "버그 ì‹ ê³ í•˜ê¸°"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "소스 코드"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "변경 기ë¡"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "ì—°ë½í•˜ê¸°"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "현재 ì‚¬ìš©í• ìˆ˜ 있는 브릿지가 없습니다..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -302,28 +327,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "ê³ ê¸‰ 옵션"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "아니오"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "ì—†ìŒ"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -331,7 +355,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ko_KR/LC_MESSAGES/bridgedb.po b/ko_KR/LC_MESSAGES/bridgedb.po
index 405b6f8..6135621 100644
--- a/ko_KR/LC_MESSAGES/bridgedb.po
+++ b/ko_KR/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/torproject/language/ko_KR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ku/LC_MESSAGES/bridgedb.po b/ku/LC_MESSAGES/bridgedb.po
index 4124f47..92fbc9a 100644
--- a/ku/LC_MESSAGES/bridgedb.po
+++ b/ku/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Kurdish (http://www.transifex.com/projects/p/torproject/language/ku/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/kw/LC_MESSAGES/bridgedb.po b/kw/LC_MESSAGES/bridgedb.po
index 421a1c4..81ff58b 100644
--- a/kw/LC_MESSAGES/bridgedb.po
+++ b/kw/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Cornish (http://www.transifex.com/projects/p/torproject/language/kw/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ky/LC_MESSAGES/bridgedb.po b/ky/LC_MESSAGES/bridgedb.po
index 4b83258..d473389 100644
--- a/ky/LC_MESSAGES/bridgedb.po
+++ b/ky/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Kirgyz (http://www.transifex.com/projects/p/torproject/language/ky/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/lb/LC_MESSAGES/bridgedb.po b/lb/LC_MESSAGES/bridgedb.po
index 5472fc9..fa1008e 100644
--- a/lb/LC_MESSAGES/bridgedb.po
+++ b/lb/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/projects/p/torproject/language/lb/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/lg/LC_MESSAGES/bridgedb.po b/lg/LC_MESSAGES/bridgedb.po
index de12cc1..da64a7e 100644
--- a/lg/LC_MESSAGES/bridgedb.po
+++ b/lg/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Ganda (http://www.transifex.com/projects/p/torproject/language/lg/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ln/LC_MESSAGES/bridgedb.po b/ln/LC_MESSAGES/bridgedb.po
index c24bf46..939e776 100644
--- a/ln/LC_MESSAGES/bridgedb.po
+++ b/ln/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Lingala (http://www.transifex.com/projects/p/torproject/language/ln/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/lo/LC_MESSAGES/bridgedb.po b/lo/LC_MESSAGES/bridgedb.po
index 1284717..3f1686a 100644
--- a/lo/LC_MESSAGES/bridgedb.po
+++ b/lo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Lao (http://www.transifex.com/projects/p/torproject/language/lo/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index 796214e..0302035 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-23 12:20+0000\n"
-"Last-Translator: Edgaras7 <system at vippsystems.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -74,7 +74,7 @@ msgstr "Labas, %s!"
msgid "Hello, friend!"
msgstr "Sveiki!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Viešieji Raktai"
@@ -142,7 +142,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -255,19 +255,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Praneškite klaidą"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Å altinio Kodas"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontaktai"
diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po
index 8650ef5..ac01ff5 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-16 17:01+0000\n"
-"Last-Translator: OjÄrs Balcers <ojars.balcers at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -74,7 +74,7 @@ msgstr "Hei, %s!"
msgid "Hello, friend!"
msgstr "Sveiks, draug!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "PubliskÄs atslÄ“gas"
@@ -142,8 +142,8 @@ msgstr "Man nepieciešams alternatīvs tiltu iegūšanas veids!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "VÄ“l cits veids kÄ saņemt tiltu sarakstus ir nosÅ«tÄ«t e-pastu uz %s. LÅ«dzu, ievÄ“rojiet, ka e-pasts jÄnosÅ«ta no norÄdÄ«to e-pasta pakalpojumu sniedzÄ“ju nodroÅ¡inÄtas adreses:\n%s vai %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -255,19 +255,19 @@ msgstr "Pieprasīt Pluggable Transport pēc TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Saņemt BridgeDB publiskÄs GnuPG atslÄ“gas kopiju."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Ziņot par kļūdu"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Pirmkods"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Izmaiņu žurnÄls"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "SazinÄties"
diff --git a/mg/LC_MESSAGES/bridgedb.po b/mg/LC_MESSAGES/bridgedb.po
index d51e994..e5edf64 100644
--- a/mg/LC_MESSAGES/bridgedb.po
+++ b/mg/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Malagasy (http://www.transifex.com/projects/p/torproject/language/mg/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/mi/LC_MESSAGES/bridgedb.po b/mi/LC_MESSAGES/bridgedb.po
index bda7f81..08beb3a 100644
--- a/mi/LC_MESSAGES/bridgedb.po
+++ b/mi/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Maori (http://www.transifex.com/projects/p/torproject/language/mi/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po
index ea612d9..c34d159 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# VHR <viktor.hr at gmail.com>, 2014
+# Viktor Hristov <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/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/projects/p/torproject/language/mk/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Што Ñе премоÑтувања?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Ми треба алтернативен начин да добијам премоÑтувања!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Моите премоÑтувања не функционираат! Ми треба помош!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index e2b0dfa..90e5dc1 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/projects/p/torproject/language/ml/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/mn/LC_MESSAGES/bridgedb.po b/mn/LC_MESSAGES/bridgedb.po
index 2ef6923..3b21886 100644
--- a/mn/LC_MESSAGES/bridgedb.po
+++ b/mn/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Mongolian (http://www.transifex.com/projects/p/torproject/language/mn/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po
index 5016bc0..097d91e 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Marathi (http://www.transifex.com/projects/p/torproject/language/mr/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ms_MY/LC_MESSAGES/bridgedb.po b/ms_MY/LC_MESSAGES/bridgedb.po
index cf32797..29045ce 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# shahril <mohd_shahril_96 at yahoo.com>, 2013
+# Mohd Shahril Bin Zainol Abidin <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/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Malay (Malaysia) (http://www.transifex.com/projects/p/torproject/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Apakah itu bridges ?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Saya perlukan cara alternatif untuk mendapatkan bridges!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Bridges saya tidak berfungsi! Saya perlukan bantuan!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Tidak"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/mt/LC_MESSAGES/bridgedb.po b/mt/LC_MESSAGES/bridgedb.po
index ae954f4..f04c2df 100644
--- a/mt/LC_MESSAGES/bridgedb.po
+++ b/mt/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Maltese (http://www.transifex.com/projects/p/torproject/language/mt/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/my/LC_MESSAGES/bridgedb.po b/my/LC_MESSAGES/bridgedb.po
index 9e3b12c..76f6b57 100644
--- a/my/LC_MESSAGES/bridgedb.po
+++ b/my/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Burmese (http://www.transifex.com/projects/p/torproject/language/my/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "လက်မá€á€¶á€·á€«"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/nah/LC_MESSAGES/bridgedb.po b/nah/LC_MESSAGES/bridgedb.po
index a4315a3..2389ec5 100644
--- a/nah/LC_MESSAGES/bridgedb.po
+++ b/nah/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Nahuatl (http://www.transifex.com/projects/p/torproject/language/nah/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/nap/LC_MESSAGES/bridgedb.po b/nap/LC_MESSAGES/bridgedb.po
index b0e34cb..da0f781 100644
--- a/nap/LC_MESSAGES/bridgedb.po
+++ b/nap/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Neapolitan (http://www.transifex.com/projects/p/torproject/language/nap/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index b631bb7..d647f6d 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-06 21:30+0000\n"
-"Last-Translator: Allan Nordhøy <comradekingu at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -24,19 +24,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "Dette var leit! Noe gikk galt med forespørselen din."
@@ -60,39 +57,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "KOMMANDOer: (kombiner KOMMANDer to å angi flere valg samtidig)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "Velkommen til BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "Nåværende støttede transport TYPEr:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "Hei, %s!"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "Hallo, lille venn!"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Offentlige nøkler"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "Denne e-posten ble laget med regnbuer, enhjørninger og stjerneskudd for %s på %s klokken %s."
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,14 +104,20 @@ msgid ""
"\n"
msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med å tilsløre dine tilkoblinger til Tor-nettverket, noe som gjør det\nvanskelig for noen som overvåker din internett-trafikk å fastsette hvorvidt du\nbruker Tor eller ei\n\n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr "Noen broer med IPv6-adresser er også tilgjelgelige, dog er noen pluggbare\nTransporter ikke IPv6-kompatible.\n\n"
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -118,96 +126,104 @@ msgid ""
"\n"
msgstr "Merk også, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke høres så tøft ut, men de kan fremdeles\nbehjelpe omgåelse av internettsensur i de fleste fall.\n\n"
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Hva er broer?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Broer %s er Tor-tilknyttninger som hjelper deg med å omgå sensur."
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Jeg trenger en alternativ måte å få broer på!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "En annen måte å tilknytte seg broer på er å sende en epost til %s. Merk at du må\nsende eposten fra en adresse tilhørende en av følgende epost-tilbydere:\n%s eller %s."
+"%s, %s or %s."
+msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Hvis din Tor ikke virker, burde du skrive epost til %s."
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Prøv å få med så mye info om dit tilfelle du kan, inkludert en liste over\nbroene og pluggbare transporter du prøvde å bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor måtte produsere, osv."
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr "Her er dine bro-linjer:"
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "FÃ¥ broer!"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "Gjør valg for brotype:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "Trenger du IPv6-adresser?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "Trenger du en %s?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "Nettleseren din viser ikke bilder ordentlig."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "Skriv inn bokstavene fra bildet ovenfor..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "Hvordan starte med bruk av dine broer"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr "For å oppføre broer i Tor-nettleseren, følg instruksjonene på %s Tor\nnettleser nedlastingsside %s for å starte Tor-nettleser."
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Når 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk på 'oppsett' og følg\nveiviseren til den forespør:"
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Sensurerer, eller blokkerer på annen måte, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -215,52 +231,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Velg 'Ja' og klikk så 'Neste'. For å sette opp nye broer, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde være klar til kamp! Hvis du får problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "Vis denne meldingen."
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "Forespørr broer med fabrikkoppsett."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "Etterspør IPv6-broer."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "Etterspørr pluggbar transport etter TYPE."
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Få kopi av BridgeDBs offentlige GnuPG-nøkkel."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Rapporter en feil"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Kildekode"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Endringslogg"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "PÃ¥ tryne i myra!"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "Det er for tiden ingen tilgjengelige broer..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -301,28 +326,27 @@ msgstr "NÃ¥ %s legg til broer til Tor-nettleser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%sare gi meg noen broer!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "Avanserte valg"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Nei"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "ingen"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -330,7 +354,7 @@ msgstr "%sJ%sa!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sT%silknytt broer"
diff --git a/nds/LC_MESSAGES/bridgedb.po b/nds/LC_MESSAGES/bridgedb.po
index dc9f7b7..c6fae91 100644
--- a/nds/LC_MESSAGES/bridgedb.po
+++ b/nds/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Low German (http://www.transifex.com/projects/p/torproject/language/nds/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ne/LC_MESSAGES/bridgedb.po b/ne/LC_MESSAGES/bridgedb.po
index ea4d49a..5695251 100644
--- a/ne/LC_MESSAGES/bridgedb.po
+++ b/ne/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Nepali (http://www.transifex.com/projects/p/torproject/language/ne/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po
index cecc09d..efff611 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -5,20 +5,20 @@
# Translators:
# Adriaan Callaerts <adriaan.callaerts at gmail.com>, 2013
# Ann Boen <ann.boen at gmail.com>, 2014
-# erwindelaat <erwin.de.laat at cleveridge.org>, 2014
-# WMRKameleon <info at wmrkameleon.nl>, 2013
+# Cleveridge <erwin.de.laat at cleveridge.org>, 2014
+# Johann Behrens <info at wmrkameleon.nl>, 2013
# Shondoit Walker <shondoit at gmail.com>, 2011
-# Marco Brohet <therbom at gmail.com>, 2012
-# guryman <tombecht at live.nl>, 2014
+# Marco Brohet <inactive+therbom at transifex.com>, 2012
+# Tom Becht <tombecht at live.nl>, 2014
# math1985 <transifex at matthijsmelissen.nl>, 2013
# BBLN <webmaster at bbln.nl>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-02 15:22+0000\n"
-"Last-Translator: Ann Boen <ann.boen at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -29,19 +29,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Er is iets mis gegaan met je verzoek."
@@ -65,39 +62,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combineer commando's om meerdere opties tegelijkertijd te specificeren)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "Welkom bij BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "Huidig ondersteunde transport TYPEs:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "Hoi, %s!"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "Hallo, vriend!"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Publieke Sleutels"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "Deze email is gegenereerd met regenbogen, eenhoorns, en fonkelingen voor %s op %s om %s."
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,14 +109,20 @@ msgid ""
"\n"
msgstr "BridgeDB kan voorzien in bridges met meerdere Pluggable Transports%s %stypes,\ndie helpen bij het verduisteren van uw connecties naar het Tor netwerk,\nwaardoor het moeilijker wordt voor anderen om uw internet traffic te bekijken en vast te stellen dat u Tor gebruikt.\n\n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr "Sommige bridges met IPv6 adressen zijn eveneens beschikbaar, maar sommige Pluggable\nTransports bieden geen ondersteuning voor IPv6.\n"
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,96 +131,104 @@ msgid ""
"\n"
msgstr "Verder heeft BridgeDB genoeg oude vanilla bridges %s zonder enige\nPluggable Transports %s wat mogelijk niet zo cool klinkt, maar deze kunnen nog steeds helpen bij het omzeilen van internetcensuur in de meeste gevallen.\n\n"
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s zijn Tor relays die je helpen censuur te omzeilen."
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Een andere manier om bridges te bemachtingen is door een email te sturen naar %s. \nHoudt er rekening mee dat u een email moet sturen door gebruik te maken van een adres van een de volgende providers:\n%s of %s."
+"%s, %s or %s."
+msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Als uw Tor niet werkt, email dan naar %s."
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Probeer zoveel mogelijk informatie toe te voegen over je situatie als je kan, waaronder de lijst met \nbridges en Pluggable Transports die je geprobeerd hebt te gebruiken, je Tor Browser versie,\nen alle meldingen welke Tor heeft uitgegeven, etc."
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr "Hier zijn je bridge regels:"
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "Krijg Bridges!"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "Selecteer opties voor bridge type:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "Heeft u IPv6 adressen nodig?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "Heeft u een %s nodig?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "Uw browser vertoont afbeeldingen niet naar behoren."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "Voer de karakters in van de afbeelding hier beneden..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "Hoe te starten met het gebruik van je bridges"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr "Om bridges toe te voegen in Tor Browser, volg de instructies op de %s Tor\nBrowser download pagina %s om de Tor Browser te starten."
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Wanneer de 'Tor Network Settings' dialoog opent, klik 'Configure' en volg\nde wizard totdat deze vraagt om:"
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokkeert of censureert je internetprovider (ISP) verbindingen\nnaar het Tor netwerk?"
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -220,52 +236,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selecteer 'Ja' en klik vervolgens 'Next'. Om je nieuwe bridges te configureren, kopieer en\nplak je de bridge regels in het invoerveld. Vervolgens klik je 'Connect', en\nben je klaar om te gaan! Als je problemen ervaart, klik dan de 'Help'\nknop in de 'Tor Network Settings' wizard voor verdere hulp."
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "Toont dit bericht."
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "Vraag vanilla bridges aan."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "Verzoek IPv6 bridges"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "Vraag een Pluggable Transport op TYPE aan."
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Verkrijg een kopie van BridgeDB's publieke GnuPG key."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Rapporteer een bug"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Broncode"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Wijzigingslogboek"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contact"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "Helaas pindakaas!"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "Er zijn momenteel geen bridges beschikbaar..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -306,28 +331,27 @@ msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "Geef me %sg%sewoon bridges!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "Geavanceerde Opties"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Nee"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "geen"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -335,7 +359,7 @@ msgstr "%sJ%sa!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%srijg Bridges"
diff --git a/nl_BE/LC_MESSAGES/bridgedb.po b/nl_BE/LC_MESSAGES/bridgedb.po
index 132589b..5684b9d 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/projects/p/torproject/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po
index d017663..0372dc2 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-08 19:01+0000\n"
-"Last-Translator: Bjørn I. <bjorn.svindseth at online.no>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -73,7 +73,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
@@ -141,7 +141,7 @@ msgstr "Eg treng ein alternativ måte å få bruer på!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -254,19 +254,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Rapporter feil"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Kjeldekode"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
diff --git a/nso/LC_MESSAGES/bridgedb.po b/nso/LC_MESSAGES/bridgedb.po
index 69eb442..46c93e3 100644
--- a/nso/LC_MESSAGES/bridgedb.po
+++ b/nso/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Northern Sotho (http://www.transifex.com/projects/p/torproject/language/nso/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/oc/LC_MESSAGES/bridgedb.po b/oc/LC_MESSAGES/bridgedb.po
index 4e941f6..093069d 100644
--- a/oc/LC_MESSAGES/bridgedb.po
+++ b/oc/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Occitan (post 1500) (http://www.transifex.com/projects/p/torproject/language/oc/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/or/LC_MESSAGES/bridgedb.po b/or/LC_MESSAGES/bridgedb.po
index 58a38bd..ebca43f 100644
--- a/or/LC_MESSAGES/bridgedb.po
+++ b/or/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Oriya (http://www.transifex.com/projects/p/torproject/language/or/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po
index 9e5363b..1faad93 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-27 02:12+0000\n"
-"Last-Translator: A S Alam <apreet.alam at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/projects/p/torproject/language/pa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "ਪà©à¨² ਕੀ ਹਨ?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "ਨਹੀਂ"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/pap/LC_MESSAGES/bridgedb.po b/pap/LC_MESSAGES/bridgedb.po
index bc0064c..a9ea855 100644
--- a/pap/LC_MESSAGES/bridgedb.po
+++ b/pap/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Papiamento (http://www.transifex.com/projects/p/torproject/language/pap/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po
index ec21fcb..e578ead 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-25 10:05+0000\n"
-"Last-Translator: Aron <aron.plotnikowski at cryptolab.net>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -79,7 +79,7 @@ msgstr "Witaj, %s!"
msgid "Hello, friend!"
msgstr "Witaj przyjacielu!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Klucze Publiczne"
@@ -147,8 +147,8 @@ msgstr "Potrzebuję alternatywnego sposobu na pozyskanie mostków!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Innym sposobem uzyskania bridges jest wysłanie e-maila do %s. Proszę pamiętaj, że musisz \nwysłać e-mail za uzywając adresu z jednego z następujących dostawców usługi email:\n%s lub %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "PoproÅ› o Pluggable Transport przez TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Uzyskaj kopiÄ™ klucza publicznego GnuPG BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Zgłoś Błąd"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Kod źródłowy"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Lista zmian"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
diff --git a/pms/LC_MESSAGES/bridgedb.po b/pms/LC_MESSAGES/bridgedb.po
index fd17309..3512980 100644
--- a/pms/LC_MESSAGES/bridgedb.po
+++ b/pms/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Piemontese (http://www.transifex.com/projects/p/torproject/language/pms/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ps/LC_MESSAGES/bridgedb.po b/ps/LC_MESSAGES/bridgedb.po
index 440ebaa..9ffdc96 100644
--- a/ps/LC_MESSAGES/bridgedb.po
+++ b/ps/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Pushto (http://www.transifex.com/projects/p/torproject/language/ps/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po
index 7d63c77..b7ef2e5 100644
--- a/pt/LC_MESSAGES/bridgedb.po
+++ b/pt/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-04 11:20+0000\n"
-"Last-Translator: Sérgio Marques <smarquespt at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -78,7 +78,7 @@ msgstr "Olá, %s!"
msgid "Hello, friend!"
msgstr "Olá, amigo!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Chaves públicas"
@@ -146,8 +146,8 @@ msgstr "Preciso de uma alternativa para obter pontes!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Outro método para obter pontes é escrever uma mensagem para %s. Tenha em atenção\nque tem de enviar a mensagem através de um dos seguintes fornecedores de correio:\n%s ou %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -259,19 +259,19 @@ msgstr "Solicita um Pluggable Transport por TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obter uma cópia da chave pública GnuPG da BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Reportar um erro"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Código fonte"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Registo de alterações"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contactos"
diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 6548767..bb6e526 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -13,9 +13,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-04 22:50+0000\n"
-"Last-Translator: Communia <ameaneantie at riseup.net>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -78,7 +78,7 @@ msgstr "Olá, %s!"
msgid "Hello, friend!"
msgstr "Olá, amigo!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Chaves Públicas"
@@ -146,8 +146,8 @@ msgstr "Preciso de um outro modo de obter pontes!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Outro modo de obter pontes é enviando um e-mail para %s. Por favor, lembre que você deve enviar o e-mail utilizando um endereço de um dos seguintes provedores de e-mail: \n%s ou %s. "
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -259,19 +259,19 @@ msgstr "Requerer Transporte Plugável por TYPE"
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obter uma cópia da chave pública GnuPG do BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Relatar um Bug"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Código Fonte:"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Registro de alterações"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contato"
diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index 5f181df..7237137 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -4,15 +4,15 @@
#
# Translators:
# Adda.17 <adrianatrifoi at gmail.com>, 2013
-# isus <isus at openmailbox.org>, 2014
+# Isus Satanescu <isus at openmailbox.org>, 2014
# laura berindei <lauraagavriloae at yahoo.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-13 19:40+0000\n"
-"Last-Translator: isus <isus at openmailbox.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -75,7 +75,7 @@ msgstr "Buna , %s!"
msgid "Hello, friend!"
msgstr "Buna , prietene !"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Chei publice"
@@ -143,8 +143,8 @@ msgstr "Am nevoie de o cale alternativă de a obține punțile !"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Alt mod de a obține punție este să trimiteți un email la %s. Remarcați că trebuie să trimiteți un email de la unul din următorii privederi::\n%s or %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -256,19 +256,19 @@ msgstr "Cereți un Pluggable Transport după TYPE."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obțineți o copie a cheii GnuPG publice a BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Raporați un bug"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Cod sursă"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Schimbări"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contact"
diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index 13b9ab0..af7f298 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -14,9 +14,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-05 18:43+0000\n"
-"Last-Translator: Vitaliy Grishenko <vitolink at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -79,7 +79,7 @@ msgstr "Ðй, %s!"
msgid "Hello, friend!"
msgstr "Привет, друг!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Открытые ключи"
@@ -147,8 +147,8 @@ msgstr "Мне нужен альтернативный ÑпоÑоб получе
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Другим ÑпоÑобом Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð¼Ð¾Ñтов ÑвлÑетÑÑ Ð¾Ñ‚Ð¿Ñ€Ð°Ð²ÐºÐ° Ñлектронного пиÑьма на Ð°Ð´Ñ€ÐµÑ %s. ПожалуйÑта, обратите внимание на то, что вы должны \nотправить Ñлектронный Ð·Ð°Ð¿Ñ€Ð¾Ñ Ñ Ð¸Ñпользованием одного из перечиÑленных ÑервиÑов:\n%s или %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -260,19 +260,19 @@ msgstr "ЗапроÑить подключаемый транÑпорт по TYPE
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Получить копию открытого GnuPG ключа BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Сообщить об ошибке"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "ИÑходный код"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Лог изменений"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Контакт"
diff --git a/ru at petr1708/LC_MESSAGES/bridgedb.po b/ru at petr1708/LC_MESSAGES/bridgedb.po
index 9adb9c4..688160a 100644
--- a/ru at petr1708/LC_MESSAGES/bridgedb.po
+++ b/ru at petr1708/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-06-06 05:50+0000\n"
-"Last-Translator: slav\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ðѣтъ"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/scn/LC_MESSAGES/bridgedb.po b/scn/LC_MESSAGES/bridgedb.po
index 346800f..618cfcd 100644
--- a/scn/LC_MESSAGES/bridgedb.po
+++ b/scn/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Sicilian (http://www.transifex.com/projects/p/torproject/language/scn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -72,7 +72,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
@@ -140,7 +140,7 @@ msgstr ""
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -253,19 +253,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
diff --git a/sco/LC_MESSAGES/bridgedb.po b/sco/LC_MESSAGES/bridgedb.po
index c25e169..d0ca225 100644
--- a/sco/LC_MESSAGES/bridgedb.po
+++ b/sco/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Scots (http://www.transifex.com/projects/p/torproject/language/sco/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/si_LK/LC_MESSAGES/bridgedb.po b/si_LK/LC_MESSAGES/bridgedb.po
index 3510dd0..20ddc56 100644
--- a/si_LK/LC_MESSAGES/bridgedb.po
+++ b/si_LK/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# ganeshwaki <ganeshwaki at gmail.com>, 2013
+# Ganesh Wakista <ganeshwaki at gmail.com>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik 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"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "සේà¶à·” යනු මොනවà·à¶¯?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "සේà¶à·” ලබà·à¶œà·à¶±à·“මට විකල්ප විධියක් මට අවà·à·Šâ€à¶ºà¶º!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "මà·à¶œà·š සේà¶à·” à·€à·à¶© නොකරයි! මට උදවු අවà·à·Šâ€à¶ºà¶ºà·’!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "නà·à¶"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po
index f529e20..b66861c 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -11,9 +11,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-04 05:30+0000\n"
-"Last-Translator: elo\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -76,7 +76,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Verejné kľúÄe"
@@ -144,7 +144,7 @@ msgstr "Potrebujem iný spôsob ako zÃskaÅ¥ premostenia!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -257,19 +257,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Nahlásiť chybu"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Zdrojový kód"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po
index c8b5855..64f4db9 100644
--- a/sk_SK/LC_MESSAGES/bridgedb.po
+++ b/sk_SK/LC_MESSAGES/bridgedb.po
@@ -3,14 +3,14 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# once <matejbacik at gmail.com>, 2014
+# once, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-23 21:20+0000\n"
-"Last-Translator: once <matejbacik at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Slovak (Slovakia) (http://www.transifex.com/projects/p/torproject/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -73,7 +73,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Verejné kľúÄe"
@@ -141,7 +141,7 @@ msgstr "Potrebujem alternatÃvny spôsob zÃskania bridges!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -254,19 +254,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
diff --git a/sl/LC_MESSAGES/bridgedb.po b/sl/LC_MESSAGES/bridgedb.po
index 8f4c480..118555b 100644
--- a/sl/LC_MESSAGES/bridgedb.po
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ne"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/sl_SI/LC_MESSAGES/bridgedb.po b/sl_SI/LC_MESSAGES/bridgedb.po
index f98d50c..457bc7f 100644
--- a/sl_SI/LC_MESSAGES/bridgedb.po
+++ b/sl_SI/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,13 @@
#
# Translators:
# marko <mr.marko at gmail.com>, 2011
-# Nwolfy, 2014
+# Nwolfy <nikopavlinek at ymail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/projects/p/torproject/language/sl_SI/)\n"
"MIME-Version: 1.0\n"
@@ -22,19 +22,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -58,39 +55,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,14 +102,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -116,96 +124,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -213,52 +229,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -299,28 +324,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -328,7 +352,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/sn/LC_MESSAGES/bridgedb.po b/sn/LC_MESSAGES/bridgedb.po
index ba893c0..627cdaa 100644
--- a/sn/LC_MESSAGES/bridgedb.po
+++ b/sn/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Shona (http://www.transifex.com/projects/p/torproject/language/sn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/so/LC_MESSAGES/bridgedb.po b/so/LC_MESSAGES/bridgedb.po
index 369a51e..5790eca 100644
--- a/so/LC_MESSAGES/bridgedb.po
+++ b/so/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Somali (http://www.transifex.com/projects/p/torproject/language/so/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/son/LC_MESSAGES/bridgedb.po b/son/LC_MESSAGES/bridgedb.po
index c802265..40f852c 100644
--- a/son/LC_MESSAGES/bridgedb.po
+++ b/son/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Songhay (http://www.transifex.com/projects/p/torproject/language/son/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/sq/LC_MESSAGES/bridgedb.po b/sq/LC_MESSAGES/bridgedb.po
index 1f8ddb2..8c8773a 100644
--- a/sq/LC_MESSAGES/bridgedb.po
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Jo"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index 78277cb..966fcda 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Serbian (http://www.transifex.com/projects/p/torproject/language/sr/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "NE"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/sr at latin/LC_MESSAGES/bridgedb.po b/sr at latin/LC_MESSAGES/bridgedb.po
index ff77f8a..b1f55b2 100644
--- a/sr at latin/LC_MESSAGES/bridgedb.po
+++ b/sr at latin/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/projects/p/torproject/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ne"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/st/LC_MESSAGES/bridgedb.po b/st/LC_MESSAGES/bridgedb.po
index 896d62d..f68fb54 100644
--- a/st/LC_MESSAGES/bridgedb.po
+++ b/st/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Sotho, Southern (http://www.transifex.com/projects/p/torproject/language/st/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/su/LC_MESSAGES/bridgedb.po b/su/LC_MESSAGES/bridgedb.po
index 3143d19..7493178 100644
--- a/su/LC_MESSAGES/bridgedb.po
+++ b/su/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Sundanese (http://www.transifex.com/projects/p/torproject/language/su/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 62c7622..e2e3a0f 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -12,9 +12,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-17 09:50+0000\n"
-"Last-Translator: phst <transifex at sturman.se>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -77,7 +77,7 @@ msgstr "Hej, %s!"
msgid "Hello, friend!"
msgstr "Hej, kompis!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Publika nycklar"
@@ -145,8 +145,8 @@ msgstr "Jag behöver ett alternativt sätt att skaffa bryggor på!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Ett annat sätt att få nya bryggor är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande epostleverantörer:\n%s eller %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -258,19 +258,19 @@ msgstr "Leta efter en Pluggable Transport av en viss TYPE"
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hämta en kopia av BridgeDB:s publika GnuPG-nyckel."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Rapportera en bugg"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Källkod"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Ändringslogg"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Kontakt"
diff --git a/sw/LC_MESSAGES/bridgedb.po b/sw/LC_MESSAGES/bridgedb.po
index 7981435..1d81f4c 100644
--- a/sw/LC_MESSAGES/bridgedb.po
+++ b/sw/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Swahili (http://www.transifex.com/projects/p/torproject/language/sw/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/szl/LC_MESSAGES/bridgedb.po b/szl/LC_MESSAGES/bridgedb.po
index 635aa19..134cac6 100644
--- a/szl/LC_MESSAGES/bridgedb.po
+++ b/szl/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Silesian (http://www.transifex.com/projects/p/torproject/language/szl/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ta/LC_MESSAGES/bridgedb.po b/ta/LC_MESSAGES/bridgedb.po
index 900c132..68d10c6 100644
--- a/ta/LC_MESSAGES/bridgedb.po
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "இலà¯à®²à¯ˆ"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/te/LC_MESSAGES/bridgedb.po b/te/LC_MESSAGES/bridgedb.po
index 591ca14..26543fc 100644
--- a/te/LC_MESSAGES/bridgedb.po
+++ b/te/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Telugu (http://www.transifex.com/projects/p/torproject/language/te/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/te_IN/LC_MESSAGES/bridgedb.po b/te_IN/LC_MESSAGES/bridgedb.po
index 2bda39c..40471d5 100644
--- a/te_IN/LC_MESSAGES/bridgedb.po
+++ b/te_IN/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Telugu (India) (http://www.transifex.com/projects/p/torproject/language/te_IN/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot
index c7fa1ab..3edc798 100644
--- a/templates/bridgedb.pot
+++ b/templates/bridgedb.pot
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: English (http://www.transifex.com/projects/p/torproject/language/en/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "Welcome to BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "Currently supported transport TYPEs:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "Hello, friend!"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Public Keys"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s."
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr "BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\nwhich can help obfuscate your connections to the Tor Network, making it more\ndifficult for anyone watching your internet traffic to determine that you are\nusing Tor.\n\n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr "Some bridges with IPv6 addresses are also available, though some Pluggable\nTransports aren't IPv6 compatible.\n\n"
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr "Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n\n"
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "What are bridges?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s are Tor relays that help you circumvent censorship."
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "I need an alternative way of getting bridges!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s or %s."
+"%s, %s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Please note that you must\nsend the email using an address from one of the following email providers:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "My bridges don't work! I need help!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "If your Tor doesn't work, you should email %s."
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Try including as much info about your case as you can, including the list of\nbridges and Pluggable Transports you tried to use, your Tor Browser version,\nand any messages which Tor gave out, etc."
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr "Here are your bridge lines:"
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "Get Bridges!"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr "To enter bridges into Tor Browser, follow the instructions on the %s Tor\nBrowser download page %s to start Tor Browser."
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\nthe wizard until it asks:"
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "Displays this message."
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "Request a Pluggable Transport by TYPE."
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Get a copy of BridgeDB's public GnuPG key."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Report a Bug"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Source Code"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Changelog"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Contact"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "Uh oh, spaghettios!"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "There currently aren't any bridges available..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sust give me bridges!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "Advanced Options"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "No"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "none"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -327,7 +351,7 @@ msgstr "%sY%ses!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set Bridges"
diff --git a/tg/LC_MESSAGES/bridgedb.po b/tg/LC_MESSAGES/bridgedb.po
index 30e326b..6b204a5 100644
--- a/tg/LC_MESSAGES/bridgedb.po
+++ b/tg/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Tajik (http://www.transifex.com/projects/p/torproject/language/tg/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po
index 1ccb89c..1a144c5 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -9,9 +9,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-06-23 08:02+0000\n"
-"Last-Translator: exploiz <exploiz at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -74,7 +74,7 @@ msgstr ""
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
@@ -142,7 +142,7 @@ msgstr "ฉันต้à¸à¸‡à¸à¸²à¸£à¸—างเลืà¸à¸à¸à¸·à¹ˆà¸™à¹€à¸ž
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
#: lib/bridgedb/strings.py:90
@@ -255,19 +255,19 @@ msgstr ""
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "à¹à¸ˆà¹‰à¸‡à¸šà¸±à¹Šà¸"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
diff --git a/ti/LC_MESSAGES/bridgedb.po b/ti/LC_MESSAGES/bridgedb.po
index ab1ff44..abb8b0e 100644
--- a/ti/LC_MESSAGES/bridgedb.po
+++ b/ti/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Tigrinya (http://www.transifex.com/projects/p/torproject/language/ti/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/tk/LC_MESSAGES/bridgedb.po b/tk/LC_MESSAGES/bridgedb.po
index b39bfee..7a56945 100644
--- a/tk/LC_MESSAGES/bridgedb.po
+++ b/tk/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Turkmen (http://www.transifex.com/projects/p/torproject/language/tk/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 0605021..9b7d2fa 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -16,9 +16,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-15 06:30+0000\n"
-"Last-Translator: zeki <zeki.ozguryazilim at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -81,7 +81,7 @@ msgstr "Selam, %s!"
msgid "Hello, friend!"
msgstr "Merhaba dostum!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Açık Anahtarlar"
@@ -149,8 +149,8 @@ msgstr "Bridges edinmek için başka bir yola ihtiyacım var!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Köprüleri almanın diğer bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aşağıdaki e-posta sağlayıcılardan birinden alınmış bir\nadresten gönderilmesi gerektiğini unutmayın:\n%s veya %s."
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -262,19 +262,19 @@ msgstr "TYPE tarafından Eklenebilir bir Aktarım talep et."
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB'nin ortak bir GnuPG anahtar kopyasını al."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Bir Hata Bildir"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Kaynak Kodu"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "Değişim günlüğü"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Ä°letiÅŸim"
diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index 502fa97..b913d44 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# ghostishev, 2014
+# Eugene ghostishev, 2014
# LinuxChata, 2014
-# AVATOR <sclub2018 at yandex.ua>, 2013
+# Oleksii Golub <sclub2018 at yandex.ua>, 2013
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 18:12+0000\n"
-"Last-Translator: LinuxChata\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -23,19 +23,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr "Ми приноÑимо наші вибаченнÑ! ЩоÑÑŒ пішло не так з Вашим запитом."
@@ -59,39 +56,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "Команди: (комбінувати команди вказавши кілька варіантів одночаÑно)"
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr "ЛаÑкаво проÑимо у BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr "У даний Ñ‡Ð°Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑŽÑ‚ÑŒÑÑ transport TYPE:"
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr "Привіт, %s!"
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr "Привіт, друже!"
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "Відкриті ключі"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr "Цей лиÑÑ‚ був згенеровано з райдугами, єдинорогами Ñ– блиÑкітками\nÐ´Ð»Ñ %s %s о %s."
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,14 +103,20 @@ msgid ""
"\n"
msgstr "BridgeDB може забезпечити bridges з декількома %sтипами Pluggable Transports%s,\nÑкі можуть допомогти приховати Ñвої зв'Ñзки з Tor мережею, що уÑкладнює роботу\nÐ´Ð»Ñ Ñ‚Ð¸Ñ…, хто перевірÑÑ” Ваш інтернет-трафік, щоб визначити, що Ви\nвикориÑтовуєте Tor. \n"
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr "ДеÑкі моÑти з адреÑами IPv6, також доÑтупні, хоча деÑкі Pluggable\nTransports не ÑуміÑні з IPv6.\n"
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -117,96 +125,104 @@ msgid ""
"\n"
msgstr "Крім того, BridgeDB має багато plain-ol'-vanilla bridges %s без\nPluggable Transports %s, Ñкі, можливо, не звучать гарно, але вони \nможуть допомогти обійти інтернет-цензуру в багатьох випадках.\n"
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "Що таке ретранÑлÑтор типу міÑÑ‚?"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s Ñ” Tor реле, Ñкі допоможуть Вам обійти цензуру."
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "Мені потрібен альтернативний ÑпоÑіб Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ ÑпиÑку моÑтів!"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "Ще один ÑпоÑіб отримати bridges - це відправити лиÑÑ‚ на адреÑу %s. Зверніть увагу, що\nВи повинні надіÑлати лиÑÑ‚, викориÑтовуючи адреÑу від одного з наÑтупних поÑтачальників\nпоÑлуг електронної пошти:\n%s або %s."
+"%s, %s or %s."
+msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr "Мої моÑти не працюють! Допоможіть!"
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Якщо Ваш Tor не працює, Ви можете відправити нам електронного лиÑта %s."
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Спробуйте додати Ñкнайбільше інформації про Ваш випадок, в тому чиÑлі ÑпиÑок\nbridges Ñ– Pluggable Transports, що Ви намагалиÑÑ Ð²Ð¸ÐºÐ¾Ñ€Ð¸Ñтовувати, верÑÑ–ÑŽ браузера Tor,\nÑ– будь-Ñкі повідомленнÑ, Ñкі Tor видавав, Ñ– Ñ‚.д."
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr "Лінії Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ bridge:"
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr "Отримати Bridges!"
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr "Будь лаÑка, оберіть параметри типу bridge:"
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr "Вам потрібні адреÑи IPv6?"
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr "Вам потрібен %s?"
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr "Ваш браузер не відображає Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ чином."
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr "Введіть зображенні Ñимволи ..."
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr "Як почати кориÑтуватиÑÑ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ bridges"
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr "Ð”Ð»Ñ Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ bridges у браузері Tor, дотримуйтеÑÑŒ інÑтрукцій %s на Ñторінці \nÐ·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Ð±Ñ€Ð°ÑƒÐ·ÐµÑ€Ð° Tor %s Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑку браузера Tor."
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Коли діалог \"ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor\" відкриєтьÑÑ, натиÑніть \"Ðалаштувати\" Ñ– дотримуйтеÑÑŒ\nпідказкам майÑтра, допоки він не запроÑить:"
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Вашій інтернет-провайдер (ISP) блокує або цензурує з'єднаннÑ\nдо мережі Tor?"
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -214,52 +230,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Виберіть \"Так\", а потім натиÑніть \"Далі\". Ð”Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¸Ñ… bridges, Ñкопіюйте Ñ–\nвÑтавте лінії bridge у поле Ð´Ð»Ñ Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту. Потім, натиÑніть 'ПідключатиÑÑ', Ñ–\nвÑе повинно працювати! Якщо у Ð’Ð°Ñ Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ проблеми, Ñпробуйте натиÑнути \"Довідка\" \nв майÑтрові \"Мережеві параметри Tor' Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— допомоги."
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr "Відображає це повідомленнÑ."
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr "Запит на Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ vanilla bridges."
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr "Запит на Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr "Запит на Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Pluggable Transport по TYPE."
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Отримати копію відкритого GnuPG ключа Ð´Ð»Ñ BridgeDB."
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "Повідомити про помилку"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "Код"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "СпиÑок змін"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "Контакт"
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr "Ой-ой, spaghettios!"
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr "Ð’ даний Ñ‡Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” доÑтупних bridges ..."
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -300,28 +325,27 @@ msgstr "Тепер %s додай bridges до Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sТ%sільки дай мені bridges!"
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr "Розширені Параметри"
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "ÐÑ–"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr "жоден"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr "%sТ%sак!"
@@ -329,7 +353,7 @@ msgstr "%sТ%sак!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sО%sтримати Bridges"
diff --git a/ur/LC_MESSAGES/bridgedb.po b/ur/LC_MESSAGES/bridgedb.po
index edebefa..40ac002 100644
--- a/ur/LC_MESSAGES/bridgedb.po
+++ b/ur/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Urdu (http://www.transifex.com/projects/p/torproject/language/ur/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ur_PK/LC_MESSAGES/bridgedb.po b/ur_PK/LC_MESSAGES/bridgedb.po
index acc7142..e84f15b 100644
--- a/ur_PK/LC_MESSAGES/bridgedb.po
+++ b/ur_PK/LC_MESSAGES/bridgedb.po
@@ -7,9 +7,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2011-02-19 16:53+0000\n"
-"Last-Translator: Isis Lovecruft <isis at torproject.org>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/projects/p/torproject/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Ù†Ûیں"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/uz/LC_MESSAGES/bridgedb.po b/uz/LC_MESSAGES/bridgedb.po
index 9c9e120..771708c 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -3,13 +3,13 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Umidjon Almasov <u.almasov at gmail.com>, 2013
+# Umid 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/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Uzbek (http://www.transifex.com/projects/p/torproject/language/uz/)\n"
"MIME-Version: 1.0\n"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Yo'q"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/ve/LC_MESSAGES/bridgedb.po b/ve/LC_MESSAGES/bridgedb.po
index aaf5b36..7131787 100644
--- a/ve/LC_MESSAGES/bridgedb.po
+++ b/ve/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Venda (http://www.transifex.com/projects/p/torproject/language/ve/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index 60e3a4e..4270ab2 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/projects/p/torproject/language/vi/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "Không"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/wa/LC_MESSAGES/bridgedb.po b/wa/LC_MESSAGES/bridgedb.po
index 93f7c96..961a708 100644
--- a/wa/LC_MESSAGES/bridgedb.po
+++ b/wa/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Walloon (http://www.transifex.com/projects/p/torproject/language/wa/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/wo/LC_MESSAGES/bridgedb.po b/wo/LC_MESSAGES/bridgedb.po
index 5ff3dc0..b30d651 100644
--- a/wo/LC_MESSAGES/bridgedb.po
+++ b/wo/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Wolof (http://www.transifex.com/projects/p/torproject/language/wo/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index aa17299..9371bb0 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -15,9 +15,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-20 12:20+0000\n"
-"Last-Translator: Wu Ming Shi\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -80,7 +80,7 @@ msgstr "嘿，%sï¼"
msgid "Hello, friend!"
msgstr "ä½ å¥½ï¼Œæœ‹å‹ï¼"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "公共密匙"
@@ -148,8 +148,8 @@ msgstr "需è¦ä½¿ç”¨å…¶ä»–获å–æ–¹å¼èŽ·å–网桥ï¼"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "获得 bridges（网桥）的å¦ä¸€ç§æ–¹æ³•æ˜¯å‘ %s å‘é€ä¸€å°é‚®ä»¶ã€‚注æ„：您åªèƒ½ä½¿ç”¨ä»¥ä¸‹é‚®ä»¶æœåŠ¡å•†æ供的邮件地å€å‘é€ï¼š%s 或 %s 。"
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -261,19 +261,19 @@ msgstr "æ ¹æ®TYPE 请求Pluggable Transport。"
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "获å–BridgeDB的公共GnuPG密匙。"
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "报告缺陷"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "æºä»£ç "
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "更改日志"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "è”系方å¼"
diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index 78441d1..054c4ea 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -8,8 +8,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 14:36+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik 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"
@@ -21,19 +21,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -57,39 +54,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -99,14 +101,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -115,96 +123,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr "什麼是橋？"
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr "我需è¦å¾—到å¦ä¸€ç¨®æ–¹å¼ä¾†å¾—到橋ï¼"
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -212,52 +228,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -298,28 +323,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr "å¦"
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -327,7 +351,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index af5a4bb..500b852 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -8,9 +8,9 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-06-06 21:46+0000\n"
-"PO-Revision-Date: 2014-07-05 18:43+0000\n"
-"Last-Translator: danfong <danfong.hsieh at gmail.com>\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
+"Last-Translator: runasand <runa.sandvik 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"
@@ -73,7 +73,7 @@ msgstr "嘿，%s!"
msgid "Hello, friend!"
msgstr "朋å‹ï¼Œæ‚¨å¥½!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr "公開金鑰"
@@ -141,8 +141,8 @@ msgstr "我需è¦ä½¿ç”¨å…¶ä»–æ–¹å¼å–得橋接!"
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
-msgstr "å–得橋接的å¦ä¸€ç¨®æ–¹å¼æ˜¯ç™¼é€é›»å郵件至 %s。請注æ„ï¼Œæ‚¨å¿…é ˆ \n使用來自下列電å郵件æ供者之一的ä½å€ç™¼é€é›»å郵件: \n%s 或 %s。"
+"%s, %s or %s."
+msgstr ""
#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
@@ -254,19 +254,19 @@ msgstr "按照 TYPE 請求 Pluggable Transport。"
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "å–å¾— BridgeDB 的公共 GnuPG 金鑰副本。"
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr "å›žå ±éŒ¯èª¤"
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr "原始程å¼ç¢¼"
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr "變更記錄"
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr "連絡資訊"
diff --git a/zu/LC_MESSAGES/bridgedb.po b/zu/LC_MESSAGES/bridgedb.po
index 1bde4d3..402f3fd 100644
--- a/zu/LC_MESSAGES/bridgedb.po
+++ b/zu/LC_MESSAGES/bridgedb.po
@@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-05-16 18:39+0000\n"
-"PO-Revision-Date: 2014-05-17 09:08+0000\n"
+"POT-Creation-Date: 2014-07-26 02:11+0000\n"
+"PO-Revision-Date: 2014-07-26 09:42+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
"Language-Team: Zulu (http://www.transifex.com/projects/p/torproject/language/zu/)\n"
"MIME-Version: 1.0\n"
@@ -20,19 +20,16 @@ msgstr ""
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
-#. "bridge"
-#. "bridges"
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
#. "obfs2"
#. "obfs3"
#. "scramblesuit"
-#. "fte"
+#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#. "TBB"
-#: lib/bridgedb/HTTPServer.py:124
+#: lib/bridgedb/HTTPServer.py:121
msgid "Sorry! Something went wrong with your request."
msgstr ""
@@ -56,39 +53,44 @@ msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
-#: lib/bridgedb/strings.py:27
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: lib/bridgedb/strings.py:28
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:29
+#: lib/bridgedb/strings.py:30
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:30
+#: lib/bridgedb/strings.py:31
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: lib/bridgedb/strings.py:32
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:32 lib/bridgedb/templates/base.html:100
+#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
msgid "Public Keys"
msgstr ""
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:36
+#: lib/bridgedb/strings.py:37
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
msgstr ""
-#: lib/bridgedb/strings.py:42
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#. TRANSLATORS: Please DO NOT translate "Tor Network".
+#: lib/bridgedb/strings.py:47
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -98,14 +100,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:48
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: lib/bridgedb/strings.py:54
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:52
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: lib/bridgedb/strings.py:63
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -114,96 +122,104 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:65
+#: lib/bridgedb/strings.py:76
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:66
+#: lib/bridgedb/strings.py:77
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:71
+#: lib/bridgedb/strings.py:82
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:72
+#: lib/bridgedb/strings.py:83
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
-"%s or %s."
+"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:79
+#: lib/bridgedb/strings.py:90
msgid "My bridges don't work! I need help!"
msgstr ""
-#: lib/bridgedb/strings.py:80
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:92
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
-#: lib/bridgedb/strings.py:81
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:96
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:88
+#: lib/bridgedb/strings.py:103
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:89
+#: lib/bridgedb/strings.py:104
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:93
+#: lib/bridgedb/strings.py:108
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:94
+#: lib/bridgedb/strings.py:109
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:95
+#: lib/bridgedb/strings.py:110
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:99
+#: lib/bridgedb/strings.py:114
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:100
+#: lib/bridgedb/strings.py:115
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: lib/bridgedb/strings.py:119
msgid "How to start using your bridges"
msgstr ""
-#: lib/bridgedb/strings.py:105
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: lib/bridgedb/strings.py:121
#, python-format
msgid ""
"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
"Browser download page %s to start Tor Browser."
msgstr ""
-#: lib/bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:125
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
-#: lib/bridgedb/strings.py:111
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:129
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: lib/bridgedb/strings.py:133
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -211,52 +227,61 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:122
+#: lib/bridgedb/strings.py:141
msgid "Displays this message."
msgstr ""
-#: lib/bridgedb/strings.py:123
+#. TRANSLATORS: Please try to make it clear that "vanilla" here refers to the
+#. same non-Pluggable Transport bridges described above as being
+#. "plain-ol'-vanilla" bridges.
+#: lib/bridgedb/strings.py:145
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:124
+#: lib/bridgedb/strings.py:146
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:126
+#: lib/bridgedb/strings.py:148
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
-#: lib/bridgedb/strings.py:127
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: lib/bridgedb/strings.py:151
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-#: lib/bridgedb/templates/base.html:91
+#: lib/bridgedb/templates/base.html:92
msgid "Report a Bug"
msgstr ""
-#: lib/bridgedb/templates/base.html:93
+#: lib/bridgedb/templates/base.html:94
msgid "Source Code"
msgstr ""
-#: lib/bridgedb/templates/base.html:96
+#: lib/bridgedb/templates/base.html:97
msgid "Changelog"
msgstr ""
-#: lib/bridgedb/templates/base.html:98
+#: lib/bridgedb/templates/base.html:99
msgid "Contact"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:65
+#. TRANSLATORS: Please translate this into some silly way to say
+#. "There was a problem!" in your language. For example,
+#. for Italian, you might translate this into "Mama mia!",
+#. or for French: "Sacrebleu!". :)
+#: lib/bridgedb/templates/bridges.html:66
msgid "Uh oh, spaghettios!"
msgstr ""
-#: lib/bridgedb/templates/bridges.html:70
+#: lib/bridgedb/templates/bridges.html:72
msgid "There currently aren't any bridges available..."
msgstr ""
-#: lib/bridgedb/templates/bridges.html:71
+#: lib/bridgedb/templates/bridges.html:73
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
@@ -297,28 +322,27 @@ msgstr ""
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#. TRANSLATORS: Please do NOT translate the word "bridges"!
-#: lib/bridgedb/templates/options.html:39
+#: lib/bridgedb/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr ""
-#: lib/bridgedb/templates/options.html:53
+#: lib/bridgedb/templates/options.html:52
msgid "Advanced Options"
msgstr ""
-#: lib/bridgedb/templates/options.html:89
+#: lib/bridgedb/templates/options.html:88
msgid "No"
msgstr ""
-#: lib/bridgedb/templates/options.html:90
+#: lib/bridgedb/templates/options.html:89
msgid "none"
msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:131
+#: lib/bridgedb/templates/options.html:130
#, python-format
msgid "%sY%ses!"
msgstr ""
@@ -326,7 +350,7 @@ msgstr ""
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:155
+#: lib/bridgedb/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr ""
More information about the tor-commits
mailing list