[tor-commits] [translation/bridgedb] Update translations for bridgedb
translation at torproject.org
translation at torproject.org
Mon Mar 21 16:45:54 UTC 2016
commit d55c83742ebcee4d6252c427cdf0e136212b5b7f
Author: Translation commit bot <translation at torproject.org>
Date: Mon Mar 21 16:45:52 2016 +0000
Update translations for bridgedb
---
af/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
ar/LC_MESSAGES/bridgedb.po | 2 +-
ast/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
az/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
be/LC_MESSAGES/bridgedb.po | 4 +-
bg/LC_MESSAGES/bridgedb.po | 2 +-
bn/LC_MESSAGES/bridgedb.po | 2 +-
bn_IN/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
br/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
bs/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
ca/LC_MESSAGES/bridgedb.po | 2 +-
cs/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
cv/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
cy/LC_MESSAGES/bridgedb.po | 2 +-
da/LC_MESSAGES/bridgedb.po | 2 +-
de/LC_MESSAGES/bridgedb.po | 4 +-
el/LC_MESSAGES/bridgedb.po | 4 +-
en_GB/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
eo/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
es/LC_MESSAGES/bridgedb.po | 2 +-
es_AR/LC_MESSAGES/bridgedb.po | 2 +-
es_CL/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
es_CO/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
es_MX/LC_MESSAGES/bridgedb.po | 2 +-
et/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
eu/LC_MESSAGES/bridgedb.po | 2 +-
fa/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
fi/LC_MESSAGES/bridgedb.po | 2 +-
fil/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
fo/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
fr/LC_MESSAGES/bridgedb.po | 2 +-
fr_CA/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
fy/LC_MESSAGES/bridgedb.po | 2 +-
gl/LC_MESSAGES/bridgedb.po | 2 +-
he/LC_MESSAGES/bridgedb.po | 2 +-
hi/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
hr/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
hr_HR/LC_MESSAGES/bridgedb.po | 126 +++++++-------
hu/LC_MESSAGES/bridgedb.po | 2 +-
ia/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
id/LC_MESSAGES/bridgedb.po | 4 +-
is/LC_MESSAGES/bridgedb.po | 337 +++++++++++++++++------------------
it/LC_MESSAGES/bridgedb.po | 2 +-
ja/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
ka/LC_MESSAGES/bridgedb.po | 2 +-
kk/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
km/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
kn/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
ko/LC_MESSAGES/bridgedb.po | 2 +-
ko_KR/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
ku/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
ku_IQ/LC_MESSAGES/bridgedb.po | 2 +-
la/LC_MESSAGES/bridgedb.po | 2 +-
lb/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
lo/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
lt/LC_MESSAGES/bridgedb.po | 10 +-
lv/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
mk/LC_MESSAGES/bridgedb.po | 4 +-
ml/LC_MESSAGES/bridgedb.po | 2 +-
mr/LC_MESSAGES/bridgedb.po | 2 +-
ms_MY/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
my/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
nb/LC_MESSAGES/bridgedb.po | 4 +-
nl/LC_MESSAGES/bridgedb.po | 2 +-
nl_BE/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
nn/LC_MESSAGES/bridgedb.po | 2 +-
pa/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
pl/LC_MESSAGES/bridgedb.po | 339 ++++++++++++++++++------------------
pt/LC_MESSAGES/bridgedb.po | 4 +-
pt_BR/LC_MESSAGES/bridgedb.po | 2 +-
ro/LC_MESSAGES/bridgedb.po | 339 ++++++++++++++++++------------------
ru/LC_MESSAGES/bridgedb.po | 2 +-
ru at petr1708/LC_MESSAGES/bridgedb.po | 337 +++++++++++++++++------------------
si_LK/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
sk/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
sk_SK/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
sl/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
sl_SI/LC_MESSAGES/bridgedb.po | 2 +-
sq/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
sr/LC_MESSAGES/bridgedb.po | 2 +-
sr at latin/LC_MESSAGES/bridgedb.po | 2 +-
sv/LC_MESSAGES/bridgedb.po | 4 +-
ta/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
te_IN/LC_MESSAGES/bridgedb.po | 2 +-
th/LC_MESSAGES/bridgedb.po | 2 +-
tr/LC_MESSAGES/bridgedb.po | 2 +-
uk/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
ur_PK/LC_MESSAGES/bridgedb.po | 333 +++++++++++++++++------------------
uz/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
vi/LC_MESSAGES/bridgedb.po | 335 +++++++++++++++++------------------
zh_CN/LC_MESSAGES/bridgedb.po | 2 +-
zh_HK/LC_MESSAGES/bridgedb.po | 2 +-
zh_TW/LC_MESSAGES/bridgedb.po | 2 +-
93 files changed, 8013 insertions(+), 7966 deletions(-)
diff --git a/af/LC_MESSAGES/bridgedb.po b/af/LC_MESSAGES/bridgedb.po
index b393cd3..5dbf0e2 100644
--- a/af/LC_MESSAGES/bridgedb.po
+++ b/af/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-05 16:55+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Douglas van Wyngaard <cisticolamedia at gmail.com>\n"
-"Language-Team: Afrikaans (http://www.transifex.com/projects/p/torproject/language/af/)\n"
+"Language-Team: Afrikaans (http://www.transifex.com/otf/torproject/language/af/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: af\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Jammer! Iets het verkeerd geloop met jou versoek."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr ""
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index 8105ab9..74ef34d 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -25,7 +25,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-03 11:13+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: ouss <oussjarrouse at gmail.com>\n"
"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
"MIME-Version: 1.0\n"
diff --git a/ast/LC_MESSAGES/bridgedb.po b/ast/LC_MESSAGES/bridgedb.po
index a45f67a..4cfec21 100644
--- a/ast/LC_MESSAGES/bridgedb.po
+++ b/ast/LC_MESSAGES/bridgedb.po
@@ -6,14 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Asturian (http://www.transifex.com/projects/p/torproject/language/ast/)\n"
+"Language-Team: Asturian (http://www.transifex.com/otf/torproject/language/ast/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ast\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -28,57 +29,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Non"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -89,7 +215,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,7 +226,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -112,7 +238,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -121,20 +247,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -142,12 +268,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -155,48 +281,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -205,21 +331,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -227,153 +353,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Non"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/az/LC_MESSAGES/bridgedb.po b/az/LC_MESSAGES/bridgedb.po
index 8c012ad..9fcb0c1 100644
--- a/az/LC_MESSAGES/bridgedb.po
+++ b/az/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Azerbaijani (http://www.transifex.com/projects/p/torproject/language/az/)\n"
+"Language-Team: Azerbaijani (http://www.transifex.com/otf/torproject/language/az/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Üzr istəyirik! Tələbinlə bağlı nə isə səhv oldu."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Problemi Xəbər Ver"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Mənbə Şifrəsi"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Dəyişikliklər"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ÆlaqÉ™"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Vay dədəm!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Hazırda mümkün körpü yoxdur..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Çox güman ki, sən %s geri qayıdıb %s başqa körpü növü seçməli idin!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1-ci%s Addım"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s Yüklə"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2-ci%s Addım"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Körpü %s ÆldÉ™ Et"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3-cü%s Addım"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "İndi %s körpüləri Tor Browser-nə əlavə et %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%sadəcə mənə körpü ver!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ætraflı SeçimlÉ™r"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Xeyr"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "heç biri"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sB%səli!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sK%sörpü ÆldÉ™ Et"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Bu avtomatik cavabdır, lütfən cavab yazma.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Bu da sənin körpülərin:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Səs limitini keçmisən. Lütfən yavaşla! Emaillər arası minimal vaxt\n%s saatdır. Bu zaman kəsiyində daxil edilən diər emaillər ləğv ediləcəkdir."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "ÆMRLÆR: (bir neçə seçimi müəyyÉ™nləşdirmÉ™k üçün ÆMRLÆRi birləşdir)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB-ə xoş gəlkmisən!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Mövcud dəstəklənən nəqliyyat NÖVləri:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Ey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Salam, dost!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "İctimai Açarlar"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr "Bu email göy qurşağı, təbuynuz və qığılcımla hazırlanıb\n%s
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr "BridgeDB müxtəlif %s növ Pluggable Transport %s vasitəsilə körpülər müəyyən \nedə bilər, bu sənin internet trafikini yoxlamaq istəyən hər hansı şəxs üçün \nəlaqələrini Tor Network ilə kölgələyərək sənin Tor istifadə etdiyini müəyyən \netməsinə daha çox mane olacaqdır.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr "Pluggable Transports vasitəsilə mövcud olan IPv6 ünvanlı bir çox \
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr "Bundan əlavə BridgeDB Pluggable Transports %s olmayan bir sıra darıxdırıcı \nkörpülər %s də vardır, amma onlar yenə də internet senzurasından \nsovuşmağı bacarırlar.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Körpülər nədir?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Körpülər %s Tor-un keçidi olub sənə senzuradan sovuşmağa kömək edir."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Körpülərin əldə edilməsinin alternativ yollarını axtarıram!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr "Körpüləri əldə etməyin başqa yolu da %s emailinə məktub yazmaqdır. Lütfən, yadında\nsaxla ki, email göndərən zaman aşağıdakı email təmin edicilərindən birini istifadə etməlisən:\n%s, %s və ya %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Körpülərim işlərmir! Köməyə ehtiyacım var!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "ÆgÉ™r Tor iÅŸlÉ™mirsÉ™, sÉ™n %s ünvanına yazmalısan."
@@ -156,48 +282,48 @@ msgstr "ÆgÉ™r Tor iÅŸlÉ™mirsÉ™, sÉ™n %s ünvanına yazmalısan."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Yaranan vəziyyət haqqında ətraflı məlumat yazmağa çalış; körpülərin siyahısı və \nistifadə etməyə çalışdığı Pluggable Transport-un adı, Tor Browser versiyan və \nTor tərəfindən aldığın hər hansı mesaj və s."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Sənin körpü sətirlərin:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Körpü ÆldÉ™ Et!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Lütfən, körpü növləri üçün seçimləri müəyyənləşdir:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 ünvanlara ehtiyacın var?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "%s ehtiyacın var?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Sənin brauzerin şəkilləri göstərə bilmir."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Yuxarıdakı şəkildən işarələri daxil et..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Körpüləri necə istifadə edəcəksən"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "'Tor Şəbəkə Parametrləri' dialoqu sıçrayıb açılsa, 'Konfiqurasiya' düyməsini kliklə\nvə vizardın dediklərinə bu sualı verənə qədər riayət et:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "İnternet Xidmət Təqdimatçısı (İXT) sənin Tor şəbəkəsinə girişini kilidləyir və ya \nəlaqələrə məhdudiyyətlər qoyur?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "ÆvvÉ™l 'BÉ™li' vÉ™ daha sonra 'NövbÉ™ti'-ni seç. Yeni körpülÉ™rini konfiqurasiya \netmÉ™k üçün körpü sÉ™tirlÉ™rini köçür vÉ™ idxal qutusuna yapışdır. Æn son olaraq, \n'ÆlaqÉ™ Yarat' düymÉ™sini kliklÉ™ vÉ™ mÉ™ncÉ™ indi davam etmÉ™k üçün yaxşı vaxtdır! \nHÉ™r hansı problemlÉ™ üzləşsÉ™n, dÉ™stÉ™k üçün 'Tor ŞəbÉ™kÉ™ ParametrlÉ™ri' vizardında \n'KömÉ™k' düymÉ™sini kliklÉ™."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Bu mesajı göstərir."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Vanil körpü xahiş et."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 körpü xahiş et."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "TYPE-a görə Pluggable Transport xahiş et."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB-nin ictimai GnuPG açarının üzünü əldə et."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Problemi Xəbər Ver"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Mənbə Şifrəsi"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Dəyişikliklər"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "ÆlaqÉ™"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Vay dədəm!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Hazırda mümkün körpü yoxdur..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Çox güman ki, sən %s geri qayıdıb %s başqa körpü növü seçməli idin!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "%s1-ci%s Addım"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s Yüklə"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "%s2-ci%s Addım"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Körpü %s ÆldÉ™ Et"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "%s3-cü%s Addım"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "İndi %s körpüləri Tor Browser-nə əlavə et %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sS%sadəcə mənə körpü ver!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ætraflı SeçimlÉ™r"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Xeyr"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "heç biri"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sB%səli!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sK%sörpü ÆldÉ™ Et"
diff --git a/be/LC_MESSAGES/bridgedb.po b/be/LC_MESSAGES/bridgedb.po
index 538f7b0..b7bcc04 100644
--- a/be/LC_MESSAGES/bridgedb.po
+++ b/be/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-08 11:14+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Сілкін СтаніÑлаў <moonblr29 at gmail.com>\n"
"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
"MIME-Version: 1.0\n"
@@ -353,7 +353,7 @@ msgid ""
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "ÐбÑрыце \"Так\" а затым націÑніце \"Далей\". Каб наладзіць маÑÑ‚Ñ‹ Ñкаріуйце Ñ–\nÑžÑтаўце радкі маÑтоў у Ñ‚ÑкÑтавае вакенца. Потым націÑніце \"Злучыцца\"\nÑ– можаце пачынаць карыÑтацца браўзÑрам. Калі вы ÑутыкнуліÑÑ Ð· праблемамі,\nпаÑпрабуйце націÑнуць \"Дапамога\" у вакенцы \"Ð¡ÐµÑ‚ÐºÐ°Ð²Ñ‹Ñ Ð½Ð°Ð»Ð°Ð´Ñ‹ Tor\" каб атрымаць падтрымку."
+msgstr "ÐбÑрыце \"Так\" а затым націÑніце \"Далей\". Каб наладзіць маÑÑ‚Ñ‹ Ñкапіруйце Ñ–\nÑžÑтаўце радкі маÑтоў у Ñ‚ÑкÑтавае вакенца. Потым націÑніце \"Злучыцца\"\nÑ– можаце пачынаць карыÑтацца браўзÑрам. Калі вы ÑутыкнуліÑÑ Ð· праблемамі,\nпаÑпрабуйце націÑнуць \"Дапамога\" у вакенцы \"Ð¡ÐµÑ‚ÐºÐ°Ð²Ñ‹Ñ Ð½Ð°Ð»Ð°Ð´Ñ‹ Tor\" каб атрымаць падтрымку."
#: bridgedb/strings.py:167
msgid "Displays this message."
diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po
index 7ff24b4..c9f936c 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-22 07:09+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Maxi <kutia0001 at gmail.com>\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
"MIME-Version: 1.0\n"
diff --git a/bn/LC_MESSAGES/bridgedb.po b/bn/LC_MESSAGES/bridgedb.po
index 6098ee3..554bba3 100644
--- a/bn/LC_MESSAGES/bridgedb.po
+++ b/bn/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-11-23 04:26+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: S. M. MAINUL KABIR <mainulkabirshibli at gmail.com>\n"
"Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
"MIME-Version: 1.0\n"
diff --git a/bn_IN/LC_MESSAGES/bridgedb.po b/bn_IN/LC_MESSAGES/bridgedb.po
index acf951c..f740605 100644
--- a/bn_IN/LC_MESSAGES/bridgedb.po
+++ b/bn_IN/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Bengali (India) (http://www.transifex.com/otf/torproject/language/bn_IN/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: bn_IN\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "দà§à¦ƒà¦–িত! কোনো কিছৠআপনার অনà§à¦°à§‹à¦§ à¦à§à¦² হয়েছে."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[à¦à¦Ÿà¦¿ à¦à¦•à¦Ÿà¦¿ সà§à¦¬à¦¯à¦¼à¦‚কà§à¦°à¦¿à¦¯à¦¼ বারà§à¦¤à¦¾ হয়; উতà§à¦¤à¦° না দয়া করে]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "à¦à¦–ানে আপনার সেতà§:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "আপনি হার সীমা অতিকà§à¦°à¦® করেছেন. মনà§à¦¥à¦° দয়া করে! সরà§à¦¬à¦¨à¦¿à¦®à§à¦¨ সময় মধà§à¦¯à§‡\n\nইমেইল %s ঘনà§à¦Ÿà¦¾. à¦à¦‡ সময়ের সময় সমসà§à¦¤ আরও ইমেইল উপেকà§à¦·à¦¾ করা হবে."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr ""
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/br/LC_MESSAGES/bridgedb.po b/br/LC_MESSAGES/bridgedb.po
index fc6cbd4..0267bba 100644
--- a/br/LC_MESSAGES/bridgedb.po
+++ b/br/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Breton (http://www.transifex.com/projects/p/torproject/language/br/)\n"
+"Language-Team: Breton (http://www.transifex.com/otf/torproject/language/br/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: br\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Petra eo ar pontoù ?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr ""
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/bs/LC_MESSAGES/bridgedb.po b/bs/LC_MESSAGES/bridgedb.po
index 4ef3495..86412bb 100644
--- a/bs/LC_MESSAGES/bridgedb.po
+++ b/bs/LC_MESSAGES/bridgedb.po
@@ -6,14 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Bosnian (http://www.transifex.com/projects/p/torproject/language/bs/)\n"
+"Language-Team: Bosnian (http://www.transifex.com/otf/torproject/language/bs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: bs\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -28,57 +29,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -89,7 +215,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,7 +226,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -112,7 +238,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -121,20 +247,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -142,12 +268,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -155,48 +281,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -205,21 +331,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -227,153 +353,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po
index 4204f15..0d8fa86 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-18 19:02+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: laia_\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/ca/)\n"
"MIME-Version: 1.0\n"
diff --git a/cs/LC_MESSAGES/bridgedb.po b/cs/LC_MESSAGES/bridgedb.po
index 3a4d8b6..0654f10 100644
--- a/cs/LC_MESSAGES/bridgedb.po
+++ b/cs/LC_MESSAGES/bridgedb.po
@@ -11,19 +11,20 @@
# Jiřà VÃrava <appukonrad at gmail.com>, 2014
# mxsedlacek, 2014
# Radek Bensch <inactive+Radog at transifex.com>, 2013
-# Tomas Palik <heidfeld at email.cz>, 2015
+# Tomas Palik, 2015
# Vlastimil Burián <burian.vlastimil2 at gmail.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-09-29 17:18+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Filip Hruska <fhr at fhrnet.eu>\n"
"Language-Team: Czech (http://www.transifex.com/otf/torproject/language/cs/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: cs\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
@@ -38,57 +39,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Promiňte! NÄ›co se stalo Å¡patnÄ› s vaÅ¡Ãm požadavkem."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Nahlásit chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Zdrojový kód"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Seznam změn"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "OznaÄit vÅ¡e"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Zobrazit QR kód"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kód pro Vaše linky k mostům"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "JežÃÅ¡ku na křÞku!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Zdá se, že nastala chyba při zpracovánà Vašeho QR kódu"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Tento QR kód obsahuje linky pro Váš most. Naskenujte ho ÄteÄkou QR kódů, abyste je zkopÃrovali na mobil nebo jiná zaÅ™ÃzenÃ."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "V souÄasnosti zde nejsou žádné mosty k dispozici..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Možná by jste mÄ›l zkusit %s jÃt zpÄ›t %s a vybrat jiný typ mostů!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Stáhnout %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ZÃskej %s mosty %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nynà %s přidejte mosty do Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sen mi dejte mosty!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "RozÅ¡ÃÅ™ené možnosti"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "žádné"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sA%sno!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sN%sastavit Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Toto je automatická zpráva; prosÃm, neodpovÃdejte na ni]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Zde jsou vaše mosty:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "PÅ™ekroÄil jste meznà limit. ProsÃme zpomalte! Minimálnà Äas nezi emaily je %s hodin. VÅ¡echny následujÃcà emaily bÄ›hem této Äasové doby budou ignorovány."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "PŘÃKAZY: (kombinujte pÅ™Ãkazy pro zadávánà vÃce možnostà souÄasnÄ›)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "VÃtejte v BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "V souÄasnosti podporované transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Ahoj, pÅ™Ãteli!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "VeÅ™ejné klÃÄe"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -99,7 +225,7 @@ msgstr "Tento email byl generován s duhou, jednorožci a jiskÅ™iÄkami\npro %s
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -110,7 +236,7 @@ msgid ""
msgstr "BridgeDB může nabÃdnou mosty s nÄ›kolika %stypes of Pluggable Transports%s,\ncož může pomoci zmást vaÅ¡e pÅ™ipojenà k Tor Network, a udÄ›lat složitÄ›jÅ¡Ã pro kohokoli\nsledovat vaÅ¡i internetovou aktivitu k urÄenà zda použÃváte Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -122,7 +248,7 @@ msgstr "Někteté mosty s IPv6 adresami jsou také k dispozici, přestože někt
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -131,20 +257,20 @@ msgid ""
"\n"
msgstr "DodateÄnÄ›, BridgeDB má spustu nudných vanilkových mostů %s bez žádných \nPluggable Transports %s což sice nemusà znÃt tak super, ale úpořád mohou\npomoci obejÃt internetovou cenzuru v mnoha pÅ™Ãpadech.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Co jsou mosty?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Mosty %s jsou Tor pÅ™enosy které vám pomáhajà obejÃt cenzuru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Chci mosty zjistit jiným způsobem!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -152,12 +278,12 @@ msgid ""
"%s, %s or %s."
msgstr "DalÅ¡Ã způsob jak dostat mosty je poslat email na %s. ProsÃme mÄ›jte na pamÄ›ti že musÃte poslat email pouze z adresy od následujÃcÃch poskytovatelů emailu:\n%s, %s nebo %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mé mosty nefungujÃ. PotÅ™ebuji pomoc!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Pokud váš Tor nepracuje měl by jste nám poslat email %s."
@@ -165,48 +291,48 @@ msgstr "Pokud váš Tor nepracuje měl by jste nám poslat email %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Pokuste se popsat co nejvÃce informacà o vaÅ¡em pÅ™Ãpadu, vÄetnÄ› listu\nmostů a pluggable Transports které jste se pokusili použÃt, vaÅ¡i verzi Tor Browser,\na jaké Tor poslal ven, atd."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Zde jsou vaše linky k mostům: "
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "ZÃskejte Mosty!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "ProsÃm vyberte nastavenà pro typ mostů:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Potřebujete IPv6 adresu?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Potřebujete %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Váš prohlÞeÄ nezobrazuje obrázky správnÄ›."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Vložte pÃsmena z obrázku výše..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Jak zaÄÃt použÃvat mosty."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -215,21 +341,21 @@ msgid ""
msgstr "K vloženà mostů do Tor Browser, postupujte podle instrukcà na %s Tor\nBrowser stránce ke staženà %s ke spuštěnà Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Když dialog 'Tor Nastavenà SÃtÄ›' vyskoÄà kliknÄ›te na 'Konfigurovat' a postupujte\npodle průvodce dokud nedostanete otázku:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokuje nebo cenzoruje váš Poskytovatel Služeb Internetu (ISP) pÅ™ipojenà k\nTor sÃti?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -237,153 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Vyberte 'Ano' a poté kliknÄ›te 'DalÅ¡Ã'. Pro konfiguraci nových mostů kopÃrujte a\nvložte linky k mostům do textového pole pro vloženÃ. Nakonec kliknÄ›te na 'PÅ™ipojit' a\nmÄ›lo by to být vÅ¡echno! Pokud narazÃte na problémy, zkuste kliknout na tlaÄÃtko 'Pomoc'\nv 'Tor Nastavenà SÃtÄ›' průvodce pro dalÅ¡Ã pomoc."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Zobrazà tuto zprávu."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Požadovat vanilla mosty."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Požadovat IPv6 mosty."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Požadovat Pluggable Transport od TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "ZÃskat kopii BridgeDS's veÅ™ejného GnuPg klÃÄe. "
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Nahlásit chybu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Zdrojový kód"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Seznam změn"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "OznaÄit vÅ¡e"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Zobrazit QR kód"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kód pro Vaše linky k mostům"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "JežÃÅ¡ku na křÞku!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Zdá se, že nastala chyba při zpracovánà Vašeho QR kódu"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Tento QR kód obsahuje linky pro Váš most. Naskenujte ho ÄteÄkou QR kódů, abyste je zkopÃrovali na mobil nebo jiná zaÅ™ÃzenÃ."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "V souÄasnosti zde nejsou žádné mosty k dispozici..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Možná by jste mÄ›l zkusit %s jÃt zpÄ›t %s a vybrat jiný typ mostů!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Stáhnout %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ZÃskej %s mosty %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nynà %s přidejte mosty do Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sen mi dejte mosty!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "RozÅ¡ÃÅ™ené možnosti"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "žádné"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sA%sno!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sN%sastavit Bridges"
diff --git a/cv/LC_MESSAGES/bridgedb.po b/cv/LC_MESSAGES/bridgedb.po
index ef34f85..1704f6e 100644
--- a/cv/LC_MESSAGES/bridgedb.po
+++ b/cv/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Chuvash (http://www.transifex.com/projects/p/torproject/language/cv/)\n"
+"Language-Team: Chuvash (http://www.transifex.com/otf/torproject/language/cv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: cv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Çук"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Мĕнле кĕперÑем?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Мана урăх çул кĕпер тĕрекĕÑем кирлĕ!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Çук"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/cy/LC_MESSAGES/bridgedb.po b/cy/LC_MESSAGES/bridgedb.po
index 4e536d7..25f4a6e 100644
--- a/cy/LC_MESSAGES/bridgedb.po
+++ b/cy/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-30 02:16+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Christopher Griffiths <transifex at cgriff.co.uk>\n"
"Language-Team: Welsh (http://www.transifex.com/otf/torproject/language/cy/)\n"
"MIME-Version: 1.0\n"
diff --git a/da/LC_MESSAGES/bridgedb.po b/da/LC_MESSAGES/bridgedb.po
index 89ab469..3a27ac3 100644
--- a/da/LC_MESSAGES/bridgedb.po
+++ b/da/LC_MESSAGES/bridgedb.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-14 01:07+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Lasse Møller <hal9k at riseup.net>\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
"MIME-Version: 1.0\n"
diff --git a/de/LC_MESSAGES/bridgedb.po b/de/LC_MESSAGES/bridgedb.po
index a43a7e9..3ea33e6 100644
--- a/de/LC_MESSAGES/bridgedb.po
+++ b/de/LC_MESSAGES/bridgedb.po
@@ -17,13 +17,13 @@
# Tobias Bannert <tobannert at gmail.com>, 2013
# Tobias Bannert <tobannert at gmail.com>, 2014
# Toralf Förster <toralf.foerster at gmx.de>, 2015
-# try once <lh-account-a at use.startmail.com>, 2015
+# try once, 2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-03 06:35+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: stefanf <stefan-josia.froschauer at deutschepost.de>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
diff --git a/el/LC_MESSAGES/bridgedb.po b/el/LC_MESSAGES/bridgedb.po
index 0452c47..9d64247 100644
--- a/el/LC_MESSAGES/bridgedb.po
+++ b/el/LC_MESSAGES/bridgedb.po
@@ -19,7 +19,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-08 20:44+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Ilias Giannaros <iliasgnrs at gmail.com>\n"
"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
"MIME-Version: 1.0\n"
@@ -89,7 +89,7 @@ msgstr "Από ότι φαίνεται, υπήÏξε Îνα Ï€Ïόβλημα κ
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
-msgstr ""
+msgstr "Αυτό το QRCode πεÏιÎχει τις γÏαμμÎÏ‚ γÎφυÏας. Διαβάστε το με Îνα QRCode scanner για να αντιγÏάψετε τις γÏαμμÎÏ‚ γÎφυÏας σε κινήτη και άλλη συσκευή."
#: bridgedb/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 2de23ef..b3a290d 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -9,14 +9,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-07 13:19+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Andi Chandler <andi at gowling.com>\n"
-"Language-Team: English (United Kingdom) (http://www.transifex.com/projects/p/torproject/language/en_GB/)\n"
+"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -31,57 +32,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Report a Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Source Code"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Select All"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Show QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode for your bridge lines"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Uh oh, spaghettios!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "It seems there was an error getting your QRCode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "There are no bridges available currently..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Step %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Step %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Get %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Step %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Now %s add the bridges to Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust give me bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Advanced Options"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+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."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[This is an automated message; please do not reply.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Here are your bridges:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Welcome to BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Currently supported transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hello, friend!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -92,7 +218,7 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s o
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,7 +229,7 @@ msgid ""
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"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -115,7 +241,7 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -124,20 +250,20 @@ msgid ""
"\n"
msgstr "Additionally, BridgeDB has plenty of plain old 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"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "What are bridges?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, 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:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "I need an alternative way of getting bridges!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -145,12 +271,12 @@ msgid ""
"%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:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "My bridges don't work! I need help!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "If your Tor doesn't work, you should email %s."
@@ -158,48 +284,48 @@ msgstr "If your Tor doesn't work, you should email %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list 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:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Here are your bridge lines:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Get Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -208,21 +334,21 @@ msgid ""
msgstr "To enter bridges into Tor Browser, first go to the %s Tor Browser download\npage %s and then follow the instructions there for downloading and starting\nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
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:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
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?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -230,153 +356,28 @@ 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:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Displays this message."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Request vanilla bridges."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Request IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Request a Pluggable Transport by TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
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:89
-msgid "Report a Bug"
-msgstr "Report a Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Source Code"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Select All"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Show QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode for your bridge lines"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "It seems there was an error getting your QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "This QRCode contains your bridge lines. Scan it with a QRCode reader to copy your bridge lines onto mobile and other devices."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "There are no bridges available currently..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Perhaps you should try %s going back %s and choosing a different bridge type!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Step %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Download %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Step %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Get %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Step %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Now %s add the bridges to Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: 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:52
-msgid "Advanced Options"
-msgstr "Advanced Options"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
diff --git a/eo/LC_MESSAGES/bridgedb.po b/eo/LC_MESSAGES/bridgedb.po
index 45af257..44fd4a9 100644
--- a/eo/LC_MESSAGES/bridgedb.po
+++ b/eo/LC_MESSAGES/bridgedb.po
@@ -9,14 +9,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Esperanto (http://www.transifex.com/projects/p/torproject/language/eo/)\n"
+"Language-Team: Esperanto (http://www.transifex.com/otf/torproject/language/eo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -31,57 +32,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Pardonu! Io ne funkcias pri via peto."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "raporti cimo"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "fontkodo"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "ÅanÄoprotokolo"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "kontakto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "ho ve, ho ve!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Nuntempe ne ekzistas retpontojn."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Vi eble davas provi %s reiri %s kaj selekti alian retpontospeco."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "paÅo %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "elÅuti %s Tor-retumilo %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "paÅo %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ekhavi %s retpotojn %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "paÅo %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sT%suj donu retpontojn al mi!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "detalaj opcioj"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "neniom/neniu"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sE%skhavi Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ĉi tiu estas aÅtomate kreita mesaÄo; bonvole ne respondu.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Jen viaj retpontoj."
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Vi superis la limiton. Bonvolu malakceli! La minimala tempo inter retleteroj estas\n%s horoj. Pliaj retiloj dum tiu tempo estos ignorata."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "ORDONOJ: (kombinu ORDONOJN por samtempe specifiki diversaj opciojn)."
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Estu bonvena al BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Nuntempe subtenata transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Saluton, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Saluton, amiko!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "publikaj Ålosiloj"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -92,7 +218,7 @@ msgstr "Ĉi tiu retletero estas generita kun ĉielarkoj, unikornoj kaj steloj\np
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,7 +229,7 @@ msgid ""
msgstr "BridgeDB povas provizi pontojn/bridges kun diversaj %stypes de Pluggable Transports%s,\nkiuj povas helpi sekretigi viajn konektojn al la Tor Network kaj malfaciligi provojn kiuj estas destinitaj\nobservi vian datumtrafikon kaj vian uzantecon de Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -115,7 +241,7 @@ msgstr "AnkaÅ kelkaj retpontoj kun IPv6-adresoj estas disponeblaj, sed iuj Plug
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -124,20 +250,20 @@ msgid ""
"\n"
msgstr "Krome BridgeDB havas abundon da regulaj retpontoj %s sen iuj\nPluggable Transports %s, kiuj eble ne estas mojosa, tamen ofte povas helpi eviti\nreta cenzuro.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Kio estas retpontoj?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s retpontoj %s estas interretaj babiloj kiuj helpas vin eviti cenzuro."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Mi bezonas alternativon ekhavi retpontojn!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -145,12 +271,12 @@ msgid ""
"%s, %s or %s."
msgstr "Sendu retletero al %s por ekhavi retpontojn alternative. Bonvolu konstati ke vi\nbezonas sendi retleteron per adreso de la sekvonta retpoÅta provizanto:\n%s, %s aÅ %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Miaj retpontoj ne funkcias! Mi bezonas helpon!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Se Tor ne funkcias, kontaktigu %s."
@@ -158,48 +284,48 @@ msgstr "Se Tor ne funkcias, kontaktigu %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Provu klarigi vian kazon tre detale kaj aldonu liston da retpontoj kaj Pluggable Transports\nkiujn vi provis uzi. Krome aldonu vian Tor Browser-version kaj ĉiujn mesaÄojn, kiujn Tor\neligis."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Jen viaj retpontoj:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Ekhavu retpontojn!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Bonvolu selekti opciojn pri retpontospeco."
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Ĉu vi bezonas IPv6-adresojn?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Ĉu vi bezonas %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Via retumilo vidigas bildojn ne dece."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Enigu la literoj en la bildo ĉi-supre."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Kiel komenci uzi viajn retpontojn."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -208,21 +334,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kiam la Tor retagordaj dialogujo elklapas, alklaku 'agordi/konfiguri' kaj sekvu\nla asistanto Äis Äi demandas: "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Ĉu via provizanto de retservoj (angle: ISP) blokas aŠalimaniere cenzuras konektojn al la Tor-reto?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -230,153 +356,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selektu 'Jes' kaj alklaku 'sekva'. Por konfiguri viajn novajn retpontojn, kopiu kaj alglui\nla retpontolineojn al la dialogujo. Finfine alklaku 'konektiÄi'.\nSe vi havas problemojn, provi alklaki la 'helpo'-butonon en la Tor-retagordasistanto\npor pli da asistado."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Vidigi ĉi tiun mesaÄon."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Peti regulajn retpontojn (nepermutebla transporta retpontoj / non-Pluggable Transport bridges)."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Peti IPv6-retpontojn."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Peti permutebla transporto de TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Ekhavi kopio de publika GnuPG-Ålosilo de BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "raporti cimo"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "fontkodo"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "ÅanÄoprotokolo"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "kontakto"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "ho ve, ho ve!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Nuntempe ne ekzistas retpontojn."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Vi eble davas provi %s reiri %s kaj selekti alian retpontospeco."
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "paÅo %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "elÅuti %s Tor-retumilo %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "paÅo %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ekhavi %s retpotojn %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "paÅo %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sT%suj donu retpontojn al mi!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "detalaj opcioj"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "neniom/neniu"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sJ%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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sE%skhavi Bridges"
diff --git a/es/LC_MESSAGES/bridgedb.po b/es/LC_MESSAGES/bridgedb.po
index 7cbd88e..7fb85a5 100644
--- a/es/LC_MESSAGES/bridgedb.po
+++ b/es/LC_MESSAGES/bridgedb.po
@@ -21,7 +21,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-12 17:32+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: EzeqGO\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
"MIME-Version: 1.0\n"
diff --git a/es_AR/LC_MESSAGES/bridgedb.po b/es_AR/LC_MESSAGES/bridgedb.po
index 8c2aa0c..1a505f0 100644
--- a/es_AR/LC_MESSAGES/bridgedb.po
+++ b/es_AR/LC_MESSAGES/bridgedb.po
@@ -15,7 +15,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-02-05 14:24+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Pablo Di Noto <pdinoto at gmail.com>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
"MIME-Version: 1.0\n"
diff --git a/es_CL/LC_MESSAGES/bridgedb.po b/es_CL/LC_MESSAGES/bridgedb.po
index 7bf8a70..9afcaa1 100644
--- a/es_CL/LC_MESSAGES/bridgedb.po
+++ b/es_CL/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Spanish (Chile) (http://www.transifex.com/otf/torproject/language/es_CL/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: es_CL\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obtenga %s puentes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "¿Cuáles son los puentes?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito una forma alternativa de obtener puentes!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "¡Mi puente no funciona! ¡Ayúdenme!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -157,48 +283,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obtenga %s puentes %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr ""
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/es_CO/LC_MESSAGES/bridgedb.po b/es_CO/LC_MESSAGES/bridgedb.po
index 4a57211..6591c95 100644
--- a/es_CO/LC_MESSAGES/bridgedb.po
+++ b/es_CO/LC_MESSAGES/bridgedb.po
@@ -10,14 +10,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-08-19 04:05+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Alfredo Chaves <achaves.blg at gmail.com>\n"
"Language-Team: Spanish (Colombia) (http://www.transifex.com/otf/torproject/language/es_CO/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: es_CO\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -32,57 +33,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Perdon! Algo fallo con tu solicitud"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Reporte un error (Bug)"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Código de la Fuente"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registro de cambios"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacto"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seleccionar todo"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostrar QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode para sus lÃneas de puente"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oh oh, espaguetios!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Parece haber un error al obtener su QRCode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Este QRCode contiene sus lineas de puente. Escanéelo con un lector de QRCode para copiar sus lineas de puente en su móvil y otros dispositivos."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "No hay puentes disponibles en el momento."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Intente %s ir de regreso %s y seleccionar un tipo diferente de puente!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Paso %s 1 %s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descargue %s Navegador Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Paso %s 2 %s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obtenga %s puentes %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Paso %s 3 %s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ahora %s agregue los puentes para Navegador Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%s J %s solamente deme los puentes!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opciones avanzadas"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Ninguno"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Puentes"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Este es un mensaje automatizado, por favor no responda.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Aquà están tus puentes. "
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Usted ha excedido el lÃmite de velocidad. Vaya más despacio por favor! El tiempo mÃnimo entre correos electrónicos es %s horas. Todos los correos electrónicos adicionales serán ignorados durante este perÃodo."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMANDOs (combina COMANDOs para especificar opciones múltiples simultáneamente) "
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Bienvenido a BrigdeDB! "
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Actualmente transporte apoyado TYPE:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Eh, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hola, amigo!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Llaves publicas "
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +219,7 @@ msgstr "Este correo electrónico ha sido creado con arco iris, unicornios y dest
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,7 +230,7 @@ msgid ""
msgstr "BrideDB puede proporcionar puentes con varios %s tipos de Transportes Conectables %s, \nlo cual puede complicar sus conecciones a la red Tor, creando mas\ndificultades para alguien observando su tráfico de internet para determinar que usted está utilizando Tor. \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -116,7 +242,7 @@ msgstr "Algunos puentes con direcciones IPv6 también se encuentran disponibles,
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,20 +251,20 @@ msgid ""
"\n"
msgstr "Adicionalmente, BridgeDB posee suficientes puentes plain-ol'-vanilla %s sin ningún \nTransporte Conectable %s lo cual puede no sonar tan interesante, pero aún\n pueden en muchas ocasiones ayudar a eludir la censura en Internet. \n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Que son los puentes?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Puentes %s son para el envÃo de información Tor que le ayuda a eludir la censura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Necesito una vÃa alternativa para obtener puentes!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,12 +272,12 @@ msgid ""
"%s, %s or %s."
msgstr "Otra manera de obtener puentes es enviar un correo electrónico a %s. Tenga en cuenta que debe enviar el correo electrónico utilizando una de las direcciones de la siguiente lista de proveedores: \n%s, %s o %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mis puentes no funcionan! Necesito ayuda!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Si su Tor no funciona, usted debe contactar por correo electrónico a %s."
@@ -159,48 +285,48 @@ msgstr "Si su Tor no funciona, usted debe contactar por correo electrónico a %s
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Intente adjuntar la mayor cantidad de información que pueda acerca de su caso, incluyendo la lista de puentes y Transportes Conectables que usted intentó utilizar, su versión de NavegadorTor, y cualquier mensaje que Tor haya mostrado, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Aquà estan sus lineas de puente: "
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Obtenga Puentes!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Por favor seleccione las opciones para el tipo de puente:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Necesita direcciones IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Necesita un %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Su navegador no muestra las imágenes correctamente."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Escriba los caracteres de la imagen de arriba..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Como empezar a usar sus puentes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -209,21 +335,21 @@ msgid ""
msgstr "Para ingresar puentes en su Navegador Tor, primero vaya a la página %s del Navegador de Descarga Tor %s y siga desde allà las instrucciones para descargar e iniciar el Navegador Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Cuando aparezca la opción \"Configuración de Navegador Tor\", haga click en \"Configurar\" y siga al wizard para ayuda adicional."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Su Proveedor de Servicio de Internet (ISP) bloquea o controla de alguna manera las conexiones a la redTor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -231,153 +357,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Seleccione 'Si' y luego haga click en 'Siguiente'. Para configurar sus puentes nuevos, copie y pegue las lÃneas de puente en la casilla de ingreso de texto. Por último, haga click en 'Conectar' y listo! Si tiene algún inconveniente, haga click en la opción 'Ayuda' en el wizard de 'Configuración de Red Tor' para asistencia adicional."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Muestra este mensaje."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Solicite puentes de vainilla."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Solicite puentes IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Solicite un Transporte Conectable por TIPO."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obtenga una copia de la llave pública GnuPG del BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Reporte un error (Bug)"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Código de la Fuente"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Registro de cambios"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contacto"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Seleccionar todo"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostrar QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode para sus lÃneas de puente"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oh oh, espaguetios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Parece haber un error al obtener su QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Este QRCode contiene sus lineas de puente. Escanéelo con un lector de QRCode para copiar sus lineas de puente en su móvil y otros dispositivos."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "No hay puentes disponibles en el momento."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Intente %s ir de regreso %s y seleccionar un tipo diferente de puente!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Paso %s 1 %s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Descargue %s Navegador Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Paso %s 2 %s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obtenga %s puentes %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Paso %s 3 %s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ahora %s agregue los puentes para Navegador Tor %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%s J %s solamente deme los puentes!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opciones avanzadas"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "Ninguno"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Puentes"
diff --git a/es_MX/LC_MESSAGES/bridgedb.po b/es_MX/LC_MESSAGES/bridgedb.po
index bf3fcd4..f54f2d8 100644
--- a/es_MX/LC_MESSAGES/bridgedb.po
+++ b/es_MX/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-18 19:02+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Luis Gerardo Flores Ortiz <luisgflores at hotmail.com>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
"MIME-Version: 1.0\n"
diff --git a/et/LC_MESSAGES/bridgedb.po b/et/LC_MESSAGES/bridgedb.po
index 2261626..8dcc168 100644
--- a/et/LC_MESSAGES/bridgedb.po
+++ b/et/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-09-15 12:18+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: G <purexxxx at hotmail.com>\n"
"Language-Team: Estonian (http://www.transifex.com/otf/torproject/language/et/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Vabandust! Midagi läks sinu päringuga valesti."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Teatage viga"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Lähtekood"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Muudatuste logi"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Vali kõik"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Näita QRKoodi"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRKood teie silla ridade jaoks"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oli seda nüüd vaja..."
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Viga tekkis teie QRKoodi hankimisel."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "See QRKood sisaldab teie silla ridu. Skaneeri seda QRKoodi lugejaga, et kopeerida silla read telefoni või teistesse seadmetesse."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ãœhtegi silda ei ole hetkel saadaval..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Võib-olla peaksid proovima %s tagasi minna %s ja valima teise silla tüübi!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s samm."
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Lae alla %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s samm."
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Hangi %s sillad %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s samm."
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nüüd %s lisa sillad Tor Browseri %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sL%sihtsalt anna mulle sillad!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Täpsemad seaded"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "mitte ükski"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%sah!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sH%sangi Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[See on automatiseeritud teada - palun ärge sellele vastake.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Siin on sinu sillad:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Oled ületanud määra limiidi. Palun võta aeglasemalt! Miinimum aeg e-mailide vahel\non %s tundi. Edasiseid e-maile selles ajavahemikus ignoreeritakse."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "KÄSUD: (ühenda KÄSUD, et täpsustada valikuid üheaegselt)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Tere tulemast BridgeDB-sse!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Hetkel toetatud transport TYPE'id"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hei, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Tervist, sõber!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Avalikud Võtmed"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "See e-mail loodi vikerkaarte, ükssarvikute ja sädemetega\n%s -le, %s k
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr "BridgeDB pakub sildu mitmete %stüüpide Pluggable Transports%s,\nmis aitavad varjutada sinu ühendust Tor Network'ile, raskendades\nkõikide sinu võrguliiklust jälgivate isikute pingutusi sinu tuvastamiseks\nkasutades Tor-i.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "Mõned sillad IPv6 aadressidega on samuti saadaval, kuigi mõned Pluggab
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr "Lisaks, BridgeDB-l on hulgaliselt tavapäraseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis võib-olla ei kõla kutsuvalt, kuid on siiski\nsuutelised aitama hiilida interneti tsensuuris nii mitmelgi juhul.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Mis on sillad?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Sillad %s on Tor-i osad, mis aitavad interneti tsensuursuses ringi hiilida."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Mul on vaja teist viisi sildade saamiseks!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr "Veel üheks sildade saamise viisiks on saates e-mail aadressile %s. Palun pange\ntähele, et peate saatma e-maili kasutades aadressi ühelt järgnevalt e-maili teenusepakkujalt:\n%s, %s või %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mu sillad ei tööta! Vajan abi!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Kui su Tor ei tööta, saada e-mail aadressile %s."
@@ -157,48 +283,48 @@ msgstr "Kui su Tor ei tööta, saada e-mail aadressile %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Proovi lisada võimalikult palju infot oma juhtumist, lisades listi sildadest ja\nPluggable Transports'iest, mida sa kasutad; oma Tor Browser'i versioon\nja kõik teated, mida Tor sulle edastas jne."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Siin on teie silla read:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Hangi Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Palun valige silla tüüp:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Kas teil on vaja IPv6 aadresse?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Kas teil on vaja %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Sinu veebilehitseja ei näita pilte õigesti."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Sisesta ülemisel pildil olevad sümbolid..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Kuidas kasutada sildu"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr "Et lisada bridges Tor Browserisse, mine %s Tor Browseri allalaadimis leheküljele %s ja järgi seal olevaid instruktsioone Tor Browseri allalaadimiseks ja käivitamiseks."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kui 'Tor võrgu seaded' dialoog kerkib esile, vajuta 'Seadista' ja järgi nõustajat kuni see küsib:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Kas teie Interneti-teenuse pakkuja (ISP) blokeerib või tsenseerib ühendusi Tor võrku?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Vali \"Jah\" ja vajuta \"Järgmine\". Et seadistada uusi sildu, kopeeri ja kleebi silla read teksti sisestamise kasti. Lõpetuseks, vajuta \"Ühenda\", ja kõik peaks toimima. Kui teil tekib probleeme, proovige \"Abi\" nuppu, \"Tor võrgu seaded-ete\" nõustajas edasise abi saamiseks."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Näita seda teadet."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Päri tavalisi sildu."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Päri IPv6 sildu."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Päri blokeeritav transport(Pluggable Transport) TYPElt."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Hangi BridgeDB publik GnuPG võti."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Teatage viga"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Lähtekood"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Muudatuste logi"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Vali kõik"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Näita QRKoodi"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRKood teie silla ridade jaoks"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oli seda nüüd vaja..."
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Viga tekkis teie QRKoodi hankimisel."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "See QRKood sisaldab teie silla ridu. Skaneeri seda QRKoodi lugejaga, et kopeerida silla read telefoni või teistesse seadmetesse."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ãœhtegi silda ei ole hetkel saadaval..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Võib-olla peaksid proovima %s tagasi minna %s ja valima teise silla tüübi!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "%s1%s samm."
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Lae alla %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "%s2%s samm."
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Hangi %s sillad %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "%s3%s samm."
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Nüüd %s lisa sillad Tor Browseri %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sL%sihtsalt anna mulle sillad!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Täpsemad seaded"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ei"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "mitte ükski"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sJ%sah!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sH%sangi Bridges"
diff --git a/eu/LC_MESSAGES/bridgedb.po b/eu/LC_MESSAGES/bridgedb.po
index ede08f0..3801305 100644
--- a/eu/LC_MESSAGES/bridgedb.po
+++ b/eu/LC_MESSAGES/bridgedb.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-11-01 19:39+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Aritz Jorge Sánchez <aritzjorges at gmail.com>\n"
"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\n"
"MIME-Version: 1.0\n"
diff --git a/fa/LC_MESSAGES/bridgedb.po b/fa/LC_MESSAGES/bridgedb.po
index 43f25aa..c188162 100644
--- a/fa/LC_MESSAGES/bridgedb.po
+++ b/fa/LC_MESSAGES/bridgedb.po
@@ -15,14 +15,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-08-26 00:52+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Ehsan Ab <a.ehsan70 at gmail.com>\n"
"Language-Team: Persian (http://www.transifex.com/otf/torproject/language/fa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: fa\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -37,57 +38,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "متاسÙانه، در رابطه با درخواست شما خطایی رخ داده است."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "گزارش یک باگ"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "کد منبع"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "لیست تغییرات"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "تماس"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "انتخاب همه"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "نمایش QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode برای خطوط پل خود"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "اوه اوه، کنسرو اسپاگتی!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "به نظر Ù…ÛŒ رسد یک خطا در گرÙتن QRCode شما وجود دارد."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "این QRCode شامل خطوط پل خود. اسکن آن را با یک خواننده QRCode برای Ú©Ù¾ÛŒ خطوط پل خود بر روی تلÙÙ† همراه Ùˆ دستگاه های دیگر."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "در Øال Øاضر هیچ پل ÛŒ در دسترس نیست"
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " شاید شما باید سعی کنید %s بازگشت %s Ùˆ انتخاب نوع پل های مختلÙ!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "مرØله %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "دانلود %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "مرØله %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "دریاÙت %s پل‌ ها %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "مرØله %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Øالا %s اضاÙÙ‡ کردن پل ها به Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sÙ%sقط بده به من پل ها را!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "گزینه های پیشرÙته"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "نه"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "هیچ"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sد%sریاÙت پل‌ها"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[این یک پیام خودکار Ù…ÛŒ باشد، لطÙا پاسخ ندهید.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Ùهرست پل‌های شما:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "شما از Øد مجاز تجاوز نموده اید. لطÙاً اندکی کند تر ایمیل بÙرستید. Øداقل زمان ممکن مابین\nارسال ایمیل ها %s ساعت است. تمامی ایمیل های بعدی در این مدت زمانی ارسال نخواهند شد."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "دستورات: (ترکیب دستورات برای مشخص کردن گزینه های متعدد به طور همزمان)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "به BridgeDB خوش آمدید!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "انواع ممکن از TYPE های انتقال:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "سلام، %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "سلام دوست من!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Public Key ها"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -98,7 +224,7 @@ msgstr "این ایمیل با رنگین کمان ها، اسب های تکشا
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -109,7 +235,7 @@ msgid ""
msgstr "BridgeDB Ù…ÛŒ تواند پل ها با %sانواع متعددی از Pluggable Transports%s Ùراهم کند Ú©Ù‡ Ú©Ù…Ú© Ù…ÛŒ کنند اتصال شما به Tor Network تا Øد امکان مبهم Ùˆ ناشناس باقی بماند Ùˆ هیچ کس دیگری نتواند به راØتی به اتصال شما به اینترنت نظارت کند Ùˆ تشخیص بدهد Ú©Ù‡ شما از Tor استÙاده Ù…ÛŒ کنید.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -121,7 +247,7 @@ msgstr "بعضی از پل‌ها با آدرس‌های IPv6 در دسترس ه
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -130,20 +256,20 @@ msgid ""
"\n"
msgstr "همچنین BridgeDB شامل تعداد زیادی پل های ابتدایی Ùˆ قدیمی است Ú©Ù‡ %s Pluggable Transports ندارند %s Ùˆ ممکن است بی مصر٠به نظر برسند اما همچنان ممکن است در موارد متعددی جهت دور زدن Ùیلترینگ به شما Ú©Ù…Ú© کنند.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "پل ها چه هستند؟"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s پل ها %s هستند بازپخش کننده های تور هستند که به شما برای دور زدن سانسورکمک می کنند ."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "به یک راه دیگر برای دریاÙت bridge ها اØتیاج دارم!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -151,12 +277,12 @@ msgid ""
"%s, %s or %s."
msgstr "یک طریق دیگری Ú©Ù‡ میتوانید پلها را بگیرید, از طریق Ùزستادن یک ایمیل به %s میباشد. لطÙا دقت Ùر مایید Ú©Ù‡ شما باید ایمیل خود را Øتما از یکی از Ùراهمکنند گان ایمیلی زیر بÙرستیذ: %s %s Ùˆ یا %s ."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "به Ú©Ù…Ú© اØتیاج دارم! پل های من کار نمی‌کنند!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "اگر تور شما کار نمی کند, شما باید ایمیل کنید %s."
@@ -164,48 +290,48 @@ msgstr "اگر تور شما کار نمی کند, شما باید ایمیل ک
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list 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:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "خطوط پل شما در اینجا:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "دریاÙت پل ها!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "لطÙا گزینه نوع پل را انتخاب کنید:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "آیا شما به آدرس های IPv6 نیاز دارید؟"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "آیا شما نیاز دارید به یک %s؟"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "مرورگر شما تصاویر را به درستی نمایش نمی دهد."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "کاراکتر ها را از تصویر بالا وارد کنید..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "چگونگی از پل‌های خود استÙاده کنید"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -214,21 +340,21 @@ msgid ""
msgstr "برای ورود به پل در مرورگر Tor ØŒ برای اولین بار %s به دانلود مرورگر Tor \nصÙØÙ‡ %s Ùˆ پس از آن به دنبال دستورالعمل دانلود Ùˆ استÙاده از\nمرورگر Tor بروید."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "وقتی Ú©Ù‡ صÙØÙ‡ 'تنظیمات شبکه تور' نمایش داده شد, روی گزینه 'پیکربندی' کلیک کنید Ùˆ دنبال کنید\nتا زمانی Ú©Ù‡ wizard از شما بپرسد:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "آیا شرکت ارایه دهنده اینترنت (ISP) شما بلاک می کند و یا سانسور می کند ارتباطات\nشبکه تور شما را؟"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -236,153 +362,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'بله' را انتخاب کرده و سپس 'بعدی' را انتخاب کنید. برای پیکربندی پل جدید خود, copy و paste کنید خطوط پل را در متن جعبه ورودی. در نهایت, روی 'اتصال' کلیک کنید,\nراه درستش این است! اگر مشکلی پیش آمد, کلیک کنید روی کلید 'راهنما'\nدر 'تنظیمات شبکه تور' wizard برای اطلاعات بیشتر."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "این پیام را نمایش می دهد."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "درخواست پل‌های عادی"
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "درخواست پل‌های IPv6"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "درخواست یک روش Transport جایگزین براساس TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "دریاÙت یک Ú©Ù¾ÛŒ از کلید عمومی BridgeDB"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "گزارش یک باگ"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "کد منبع"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "لیست تغییرات"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "تماس"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "انتخاب همه"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "نمایش QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode برای خطوط پل خود"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "اوه اوه، کنسرو اسپاگتی!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "به نظر Ù…ÛŒ رسد یک خطا در گرÙتن QRCode شما وجود دارد."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "این QRCode شامل خطوط پل خود. اسکن آن را با یک خواننده QRCode برای Ú©Ù¾ÛŒ خطوط پل خود بر روی تلÙÙ† همراه Ùˆ دستگاه های دیگر."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "در Øال Øاضر هیچ پل ÛŒ در دسترس نیست"
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " شاید شما باید سعی کنید %s بازگشت %s Ùˆ انتخاب نوع پل های مختلÙ!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "مرØله %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "دانلود %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "مرØله %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "دریاÙت %s پل‌ ها %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "مرØله %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Øالا %s اضاÙÙ‡ کردن پل ها به Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sÙ%sقط بده به من پل ها را!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "گزینه های پیشرÙته"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "نه"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sد%sریاÙت پل‌ها"
diff --git a/fi/LC_MESSAGES/bridgedb.po b/fi/LC_MESSAGES/bridgedb.po
index faa0630..cc90a9c 100644
--- a/fi/LC_MESSAGES/bridgedb.po
+++ b/fi/LC_MESSAGES/bridgedb.po
@@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-21 05:50+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Hessu Lumberi <pitkahessu at hotmail.com>\n"
"Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
"MIME-Version: 1.0\n"
diff --git a/fil/LC_MESSAGES/bridgedb.po b/fil/LC_MESSAGES/bridgedb.po
index f0d5044..d03362b 100644
--- a/fil/LC_MESSAGES/bridgedb.po
+++ b/fil/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Filipino (http://www.transifex.com/projects/p/torproject/language/fil/)\n"
+"Language-Team: Filipino (http://www.transifex.com/otf/torproject/language/fil/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: fil\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Paumanhin! Nagkaroon ng aberya sa iyong pakiusap. "
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Mag-report ng Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Source Code"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontak"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Hay, naku! "
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Walang mga tulay na maaring magamit... "
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Baka pwede mong subukang %s bumalik sa %s at pumili ng ibang tipo ng tulay! "
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Hakbang %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "I-download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Hakbang %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Kumuha ng %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Step %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Ngayon %s i-dagdag ang bridges sa Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust ibigay mo sa akin ang bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Mga advance na options"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Wala"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "wala"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ito ay isang automated na mensahe; maaring huwag mag-reply.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Heto na ang iyong mga tulay. "
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Ikaw ay lumagpas na sa rate limit. Magdahan-dahan! Ang pinakamababang oras para sa email ay %s na oras. Lahat ng papasok na emails sa oras na ito ay hindi papansinin. "
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (ipagsama and COMMANDs upang tukuyin ang iba't-ibang opsyon ng sabay-sabay)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Maligayang pagsalubong sa BridgeDB! "
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Pagbati, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Pagbati, kaibigan! "
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Pampublikong Susi"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "Ang email na ito ay ginawa gamit ang mga bahag-hari, mga ingkantong kaba
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr "Ang BridgeDb ay kayang magbigay ng bridges na may iba't-ibang %sklase ng Pluggable Transports%s, \nna makakatulong sa pag-lilihim ng iyong koneksyon sa Tor Network, at pinahihirapan \nang sinumang nagbabantay ng iyong internet traffic upang malaman na ikaw ay\ngumagamit ng Tor. \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "Ang ibang bridges na may IPv6 na address ay maaari ring makuha, ngunit a
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Ano ang mga tulay?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Kailangan ko ng alternatibong paraan upang makakuha ng mga tulay! "
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr "Ang isa pang paraan upang makakuha ng bridges ay magpadala ng email sa %s. Tandaan na dapat magpadala ng email gamit ang mga address sa mga sumusunod na email providers: \n%s, %s, o sa %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Hindi gumagana ang aking mga tulay! Kailangan ko ng tulong! "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Kapag ang Tor mo ay hindi gumagana, magpadala ng email sa%s. "
@@ -157,48 +283,48 @@ msgstr "Kapag ang Tor mo ay hindi gumagana, magpadala ng email sa%s. "
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Subukang ilagay ang impormasyon tungkol sa iyong problema sa abot ng iyong makakaya, isama na ang listahan ng mga tulay, Pluggable Transports na sinubukan mong gamitin, ang bersyon ng iyong Tor Browser at ang mga mensahe na pinadala ng Tor, atbp. "
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Narito na ang iyong mga bridge lines: "
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Kumuha ng mga Tulay! "
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Piliin ang opsyon na iyong nais para sa tipo ng mga tulay:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Kailangan mo ba ng iPv6 na adres?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Kailangan mo nga ng %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Ang iyong browser ay hindi nagpapakita ng mga imahe sa tamang paraan, "
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "I-type ang mga nakalagay sa imahe sa itaas..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Papaano simulang gamitin ang iyong mga tulay"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kapag ang 'Tor Network Settings' na dayalogo ay lumabas, i-click and 'Configure' at sundin ang wizard hanggang ito ay magtanong ng:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Ang iyong Internet Service Provider (ISP) ba ay nagba-block o nagse-censor ng mga koneksyon \nsa Tor Network?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Piliin ang 'Yes' at tsaka i-click ang 'Next'. Upang ma i-ayos ang iyong bagong bridges, kopyahin \nat idikit ang bridge lines sa text input box. Pagkatapos, i-click ang 'Connect' at\ndapat ito ay gumana na! Kapag ito ay nagka-aberya, subukang i-click ang 'Help' \nsa 'Tor Network Settings' wizard para humingi ng karagdagang tulong. "
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Ipinapakita itong mensahe."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Humiling ng vanilla bridges."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Humiling ng IPv6 bridges. "
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Humiling ng Pluggable Transport gamit ang TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Kumuha ng kopya ng pampublikong GnuPG key ng BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Mag-report ng Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Source Code"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontak"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Hay, naku! "
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Walang mga tulay na maaring magamit... "
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Baka pwede mong subukang %s bumalik sa %s at pumili ng ibang tipo ng tulay! "
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Hakbang %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "I-download %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Hakbang %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Kumuha ng %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Step %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ngayon %s i-dagdag ang bridges sa Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust ibigay mo sa akin ang bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Mga advance na options"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Wala"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "wala"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
diff --git a/fo/LC_MESSAGES/bridgedb.po b/fo/LC_MESSAGES/bridgedb.po
index 5696afd..51b7515 100644
--- a/fo/LC_MESSAGES/bridgedb.po
+++ b/fo/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Faroese (http://www.transifex.com/projects/p/torproject/language/fo/)\n"
+"Language-Team: Faroese (http://www.transifex.com/otf/torproject/language/fo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: fo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Orsaka! Tað er tvÃskinningur komin à umbøn tÃna"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Hetta er eini sjálvvirkandi boð; vinalig ikki svara.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Her eru brúgvar tÃnar:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Tú ert farin um hægst loyvda takstin. Slakka av! Minsta tÃðin Ãmillum teldupostar\ner %s tÃmar. Allir telduposta framyvir verða skúgvaðir til viks."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "STÃRIBOÃ: (set STÃRIBOÃ saman fyri at skipa stillingar samstundis)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Vælkomin til BrigdeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Núverandi flutningarsløg:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hey, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Halló vinur!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Almennir knøttar"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr "Hesin teldupostur er evnaður av ælabogum, einhyrningum og glitri\nfyri
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nei"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/fr/LC_MESSAGES/bridgedb.po b/fr/LC_MESSAGES/bridgedb.po
index 9322fb9..8306247 100644
--- a/fr/LC_MESSAGES/bridgedb.po
+++ b/fr/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-10 17:16+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: syl_\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
diff --git a/fr_CA/LC_MESSAGES/bridgedb.po b/fr_CA/LC_MESSAGES/bridgedb.po
index fe2ff53..1c77692 100644
--- a/fr_CA/LC_MESSAGES/bridgedb.po
+++ b/fr_CA/LC_MESSAGES/bridgedb.po
@@ -11,14 +11,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-21 12:30+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Trans-fr\n"
-"Language-Team: French (Canada) (http://www.transifex.com/projects/p/torproject/language/fr_CA/)\n"
+"Language-Team: French (Canada) (http://www.transifex.com/otf/torproject/language/fr_CA/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: fr_CA\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
@@ -33,57 +34,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Désolé! Quelque chose a mal tourné avec votre requête."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Signaler un bogue"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Code source"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Journal des changements"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Tout sélectionner"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Montrer le code QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Code QR de vos lignes de pont"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Une erreur est survenue!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Il semble avoir eu une erreur de récupération de votre code QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ce code QR contient vos lignes de pont. Balayez-le avec un lecteur de codes QR pour copier vos lignes de pont sur votre appareil."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Aucun pont n'est disponible présentement..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Vous devriez peut-être %s revenir en arrière %s et choisir un différent type de pont!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Étape %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Télécharger %s le navigateur Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Étape %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Obtenir %s les ponts %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Étape %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Maintenant, %s ajoutez les ponts au navigateur Tor %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "Donnez-moi %sj%suste des ponts! "
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Options avancées"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Non"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "aucun"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sO%sui!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sO%sbtenir des ponts"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ceci est un message automatisé; veuillez ne pas répondre.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Voici vos ponts :"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Vous avez dépassé la limite. Veuillez ralentir! La durée minimum entre courriels\nest de %s heures. Tout autre courriel durant cette période sera ignoré."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDES : (combinez les COMMANDES pour spécifier plusieurs options simultanément)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Bienvenue à BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "TYPES de transport pris en charge présentement :"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Allô, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Bonjour l'ami!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Clefs publiques"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -94,7 +220,7 @@ msgstr "Ce courriel a été généré avec des arcs en ciel, des unicornes et de
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,7 +231,7 @@ msgid ""
msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichable%s,\npouvant aider à obscurcir vos connexions au réseau Tor, rendant difficile pour\nquiconque surveillant votre trafic Internet de déterminer que vous\nutilisez Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -117,7 +243,7 @@ msgstr "Des ponts avec des adresses IPv6 sont aussi proposés, bien que certains
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -126,20 +252,20 @@ msgid ""
"\n"
msgstr "De plus, BridgeDB comportent de nombreux ponts %s traditionnels sans\ntransport enfichable %s qui peuvent quand même aider à contourner\nla censure Internet dans bien des cas.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Que sont les ponts?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Les ponts %s sont des relais Tor qui vous aident à contourner la censure."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "J'ai besoin d'une alternative pour obtenir des ponts!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -147,12 +273,12 @@ msgid ""
"%s, %s or %s."
msgstr "Une autre façon d'obtenir des ponts est d'envoyer un courriel à %s. Veuillez prendre\nnote que vous devez envoyer le courriel en utilisant une adresse d'un des fournisseurs\nde courriel suivants :\n%s, %s ou %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mes ponts ne fonctionnent pas, j'ai besoin d'aide!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel à %s."
@@ -160,48 +286,48 @@ msgstr "Si votre Tor ne fonctionne pas, vous devriez envoyer un courriel à %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Essayez d'inclure autant d'infos sur votre cas que possible, incluant la liste de\nponts et de transports enfichables que vous avez essayé d'utiliser, votre version du\nnavigateur Tor et tout message donné par Tor, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Voici vos lignes de pont :"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Obtenir des ponts!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Veuillez choisir des options pour le type de ponts :"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Avez-vous besoin d'adresses IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Avez-vous besoin d'un %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Votre navigateur n'affiche pas les images correctement."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Saisir les caractères inscrits sur l'image ci-dessus..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Comment commencer à utiliser vos ponts"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -210,21 +336,21 @@ msgid ""
msgstr "Pour saisir des ponts dans le navigateur Tor, rendez-vous d'abord à la %s page\nde téléchargement du navigateur Tor %s et suivez les instructions que vous y\ntrouverez pour télécharger et démarrer le navigateur Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Quand la fenêtre « Paramètres du réseau Tor » s'affiche, cliquez sur « Configurer » et\nsuivez l'assistant jusqu'à ce qu'il demande :"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Votre fournisseur de service Internet (FSI) bloque-t-il ou censure-t-il\nvos connexions au réseau Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -232,153 +358,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Sélectionnez « Oui » et ensuite cliquez sur « Suivant ». Pour configurer vos\nnouveaux ponts, copiez et collez vos lignes de pont dans la boîte de saisie\nde texte. Enfin cliquez sur « Connecter » et vous devriez avoir fini! Si vous éprouvez\ndes problèmes, essayez de cliquez sur le bouton « Aide » dans l'assistant des\n« Paramètres du réseau Tor » pour un un soutien supplémentaire."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Affiche ce message."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Demander des ponts traditionnels."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Demander des ponts IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Demander un transport enfichable par TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
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:89
-msgid "Report a Bug"
-msgstr "Signaler un bogue"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Code source"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Journal des changements"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Tout sélectionner"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Montrer le code QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Code QR de vos lignes de pont"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Une erreur est survenue!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Il semble avoir eu une erreur de récupération de votre code QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ce code QR contient vos lignes de pont. Balayez-le avec un lecteur de codes QR pour copier vos lignes de pont sur votre appareil."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Aucun pont n'est disponible présentement..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Vous devriez peut-être %s revenir en arrière %s et choisir un différent type de pont!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Étape %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Télécharger %s le navigateur Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Étape %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Obtenir %s les ponts %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Étape %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Maintenant, %s ajoutez les ponts au navigateur Tor %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "Donnez-moi %sj%suste des ponts! "
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Options avancées"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Non"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "aucun"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sO%sui!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sO%sbtenir des ponts"
diff --git a/fy/LC_MESSAGES/bridgedb.po b/fy/LC_MESSAGES/bridgedb.po
index c6786d0..9a5f8a6 100644
--- a/fy/LC_MESSAGES/bridgedb.po
+++ b/fy/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-08 18:55+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: SimSim Hof <Simenhofman at gmail.com>\n"
"Language-Team: Western Frisian (http://www.transifex.com/otf/torproject/language/fy/)\n"
"MIME-Version: 1.0\n"
diff --git a/gl/LC_MESSAGES/bridgedb.po b/gl/LC_MESSAGES/bridgedb.po
index cb4f894..aea89a3 100644
--- a/gl/LC_MESSAGES/bridgedb.po
+++ b/gl/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-28 11:41+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Xnake\n"
"Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
"MIME-Version: 1.0\n"
diff --git a/he/LC_MESSAGES/bridgedb.po b/he/LC_MESSAGES/bridgedb.po
index 64a9101..eab7e83 100644
--- a/he/LC_MESSAGES/bridgedb.po
+++ b/he/LC_MESSAGES/bridgedb.po
@@ -18,7 +18,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-07 12:35+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Kunda\n"
"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
"MIME-Version: 1.0\n"
diff --git a/hi/LC_MESSAGES/bridgedb.po b/hi/LC_MESSAGES/bridgedb.po
index eaf0c3c..af53bef 100644
--- a/hi/LC_MESSAGES/bridgedb.po
+++ b/hi/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Hindi (http://www.transifex.com/projects/p/torproject/language/hi/)\n"
+"Language-Team: Hindi (http://www.transifex.com/otf/torproject/language/hi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "उनà¥à¤¨à¤¤ विकलà¥à¤ª"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "नहीं"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "कोई à¤à¥€ नहीं"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "अरे, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "नमसà¥à¤¤à¥‡, दोसà¥à¤¤!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "उनà¥à¤¨à¤¤ विकलà¥à¤ª"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "नहीं"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/hr/LC_MESSAGES/bridgedb.po b/hr/LC_MESSAGES/bridgedb.po
index 82e3260..442da12 100644
--- a/hr/LC_MESSAGES/bridgedb.po
+++ b/hr/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-28 14:36+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Vlado V. <vlays at mail.com>\n"
-"Language-Team: Croatian (http://www.transifex.com/projects/p/torproject/language/hr/)\n"
+"Language-Team: Croatian (http://www.transifex.com/otf/torproject/language/hr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: hr\n"
"Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Oprosti! Nešto je pošlo krivo sa tvojim zahtjevom."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ovo je automatska poruka; molimo ne odgovarati.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -157,48 +283,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/hr_HR/LC_MESSAGES/bridgedb.po b/hr_HR/LC_MESSAGES/bridgedb.po
index b3c3dac..3cb6dab 100644
--- a/hr_HR/LC_MESSAGES/bridgedb.po
+++ b/hr_HR/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-17 18:19+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: erinm\n"
"Language-Team: Croatian (Croatia) (http://www.transifex.com/otf/torproject/language/hr_HR/)\n"
"MIME-Version: 1.0\n"
@@ -36,35 +36,35 @@ msgstr ""
#. "Tor Browser"
#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr ""
+msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom."
#: bridgedb/https/templates/base.html:79
msgid "Report a Bug"
-msgstr ""
+msgstr "Prijavi Greški"
#: bridgedb/https/templates/base.html:82
msgid "Source Code"
-msgstr ""
+msgstr "Izvorni Kod"
#: bridgedb/https/templates/base.html:85
msgid "Changelog"
-msgstr ""
+msgstr "Zapisnik o promjenama"
#: bridgedb/https/templates/base.html:88
msgid "Contact"
-msgstr ""
+msgstr "Kontakt"
#: bridgedb/https/templates/bridges.html:35
msgid "Select All"
-msgstr ""
+msgstr "Odaberi Sve"
#: bridgedb/https/templates/bridges.html:40
msgid "Show QRCode"
-msgstr ""
+msgstr "Pokaži QR kod"
#: bridgedb/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
-msgstr ""
+msgstr "QR kod za Vaše linije mostova"
#. TRANSLATORS: Please translate this into some silly way to say
#. "There was a problem!" in your language. For example,
@@ -73,58 +73,58 @@ msgstr ""
#: bridgedb/https/templates/bridges.html:67
#: bridgedb/https/templates/bridges.html:125
msgid "Uh oh, spaghettios!"
-msgstr ""
+msgstr "O ne, greška!"
#: bridgedb/https/templates/bridges.html:68
msgid "It seems there was an error getting your QRCode."
-msgstr ""
+msgstr "Čini se da je došlo do greške pri dobavljanju Vašeg QR koda."
#: bridgedb/https/templates/bridges.html:73
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
-msgstr ""
+msgstr "Ovaj QRKod sadrži VaÅ¡e linije mostova. Skenirajte ga s ÄitaÄem QR koda da bi kopirali linije mostova na mobilne i ostale ureÄ‘aje."
#: bridgedb/https/templates/bridges.html:131
msgid "There currently aren't any bridges available..."
-msgstr ""
+msgstr "Trenutno nema dostupnih mostova..."
#: bridgedb/https/templates/bridges.html:132
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
-msgstr ""
+msgstr "Možda bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
#: bridgedb/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
-msgstr ""
+msgstr "Korak %s1%s"
#: bridgedb/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
-msgstr ""
+msgstr "Preuzmi %s Tor Browser %s"
#: bridgedb/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
-msgstr ""
+msgstr "Korak %s2%s"
#: bridgedb/https/templates/index.html:27
#, python-format
msgid "Get %s bridges %s"
-msgstr ""
+msgstr "Dobijte %s mostove %s"
#: bridgedb/https/templates/index.html:36
#, python-format
msgid "Step %s3%s"
-msgstr ""
+msgstr "Korak %s3%s"
#: bridgedb/https/templates/index.html:38
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
+msgstr "Sad %s dodaj mostove u Tor Browser %s"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
@@ -133,19 +133,19 @@ msgstr ""
#: bridgedb/https/templates/options.html:38
#, python-format
msgid "%sJ%sust give me bridges!"
-msgstr ""
+msgstr "%sS%samo mi daj mostove!"
#: bridgedb/https/templates/options.html:51
msgid "Advanced Options"
-msgstr ""
+msgstr "Napredne Opcije"
#: bridgedb/https/templates/options.html:86
msgid "No"
-msgstr ""
+msgstr "Ne"
#: bridgedb/https/templates/options.html:87
msgid "none"
-msgstr ""
+msgstr "ništa"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
@@ -153,7 +153,7 @@ msgstr ""
#: bridgedb/https/templates/options.html:124
#, python-format
msgid "%sY%ses!"
-msgstr ""
+msgstr "%sD%sa!"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
@@ -161,50 +161,50 @@ msgstr ""
#: bridgedb/https/templates/options.html:147
#, python-format
msgid "%sG%set Bridges"
-msgstr ""
+msgstr "%sD%sobij Bridges"
#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
-msgstr ""
+msgstr "[Ovo je automatizirana poruka; molimo ne odgovarati.]"
#: bridgedb/strings.py:45
msgid "Here are your bridges:"
-msgstr ""
+msgstr "Ovdje su vaši mostovi:"
#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
-msgstr ""
+msgstr "Prešli ste limit. Molimo usporite! Minimum vremena između emailova je %s sati. Svi daljnji emailovi tijekom ovog vremenskog perioda bit će ignorirani."
#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr ""
+msgstr "COMMANDs: (kombinirajte COMMANDs kako bi naznaÄili viÅ¡e opcija istovremeno)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
-msgstr ""
+msgstr "Dobrodošli u BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
-msgstr ""
+msgstr "Trenutno podržani transport TYPEs:"
#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
-msgstr ""
+msgstr "Bok, %s!"
#: bridgedb/strings.py:57
msgid "Hello, friend!"
-msgstr ""
+msgstr "Bok, prijatelju!"
#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
-msgstr ""
+msgstr "Javni kljuÄevi"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
@@ -214,7 +214,7 @@ msgstr ""
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
"for %s on %s at %s."
-msgstr ""
+msgstr "Ovaj email je sastavljen s dugama, jednorozima i iskricama\nza %s na %s u %s."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -228,7 +228,7 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr ""
+msgstr "BridgeDB nudi mostove s razliÄitim %stipovima Pluggable Transports%s\nkoji mogu pomoći prikriti VaÅ¡e veze s Tor mrežom, otežavajući onome tko\nprati VaÅ¡ internet promet da vidi da koristite Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#: bridgedb/strings.py:79
@@ -236,7 +236,7 @@ msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr ""
+msgstr "Neki mostovi s IPv6 adresama su također dostupni, no neki Pluggable \nTransports nisu kompatibilni s IPv6.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -250,20 +250,20 @@ msgid ""
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr ""
+msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nPluggable Transports %s koji možda ne zvuÄe prezanimljivo, ali mogu\npomoći zaobići internet cenzuru u mnogo sluÄajeva.\n"
#: bridgedb/strings.py:101
msgid "What are bridges?"
-msgstr ""
+msgstr "Å to su mostovi?"
#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr ""
+msgstr "%s Mostovi %s su Tor releji koji vam pomažu zaobići cenzuru."
#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr ""
+msgstr "Trebam alternativni naÄin dobivanja mostova!"
#: bridgedb/strings.py:108
#, python-format
@@ -271,17 +271,17 @@ msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
"send the email using an address from one of the following email providers:\n"
"%s, %s or %s."
-msgstr ""
+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 davatelja email usluge: %s %s ili %s."
#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
-msgstr ""
+msgstr "Moji mostovi ne rade! Treba mi pomoć!"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
-msgstr ""
+msgstr "Ako vaš Tor ne radi, pošaljite email na %s."
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
@@ -291,40 +291,40 @@ msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
-msgstr ""
+msgstr "PokuÅ¡ajte naznaÄiti Å¡to viÅ¡e informacija o vaÅ¡em sluÄaju, ukljuÄujući popis\nmostova i Pluggable Transports koje ste pokuÅ¡ali koristiti, verziju vaÅ¡eg Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr ""
+msgstr "Ovdje su linije vaših mostova:"
#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr ""
+msgstr "Dobijte Mostove!"
#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
-msgstr ""
+msgstr "Molimo odaberite opcije za tip mosta:"
#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
-msgstr ""
+msgstr "Trebaju li vam IPv6 adrese?"
#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
-msgstr ""
+msgstr "Trebate li %s?"
#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
-msgstr ""
+msgstr "Vaš preglednik ne prikazuje slike ispravno."
#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
-msgstr ""
+msgstr "Unesite znakove sa slike iznad..."
#: bridgedb/strings.py:144
msgid "How to start using your bridges"
-msgstr ""
+msgstr "Kako poÄeti koristite VaÅ¡e mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
#: bridgedb/strings.py:146
@@ -333,21 +333,21 @@ msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
"page %s and then follow the instructions there for downloading and starting\n"
"Tor Browser."
-msgstr ""
+msgstr "Kako bi unijeli mostove u Tor Preglednik, prvo odite na %s Tor Preglednik stranicu\nza preuzimanje %s te zatim slijedite upute za preuzimanje i pokretanje\nTor Preglednika."
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
-msgstr ""
+msgstr "Kad iskoÄi prozorÄić 'Tor Mrežne Postavke', kliknite 'Konfiguriraj' i slijedite\nÄarobnjaka dok ne upita:"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
-msgstr ""
+msgstr "Blokira li vaÅ¡ Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugaÄije cenzurira veze\ns Tor mrežom?"
#. TRANSLATORS: Please DO NOT translate "Tor".
#: bridgedb/strings.py:159
@@ -356,30 +356,30 @@ msgid ""
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr ""
+msgstr "Odaberite 'Da', a zatim 'Sljedeće'. Da bi konfigurirali vaÅ¡e nove mostove, kopirajte i \nzalijepite linije mostova u kućicu za unos teksta. Na kraju, kliknite 'Spoji se', i \nsve bi trebalo biti u redu! Ako naiÄ‘ete na probleme, probajte kliknuti dugme 'Pomoć'\nu 'Tor Mrežne Postavke' Äarobnjaku za daljnju pomoć."
#: bridgedb/strings.py:167
msgid "Displays this message."
-msgstr ""
+msgstr "Prikazuje ovu poruku."
#. 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.
#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
-msgstr ""
+msgstr "Zatraži dobre, stare mostove."
#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
-msgstr ""
+msgstr "Zatraži IPv6 mostove."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
-msgstr ""
+msgstr "Zatraži Pluggable Transport po TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr ""
+msgstr "Dobij kopiju BridgeDB javnog GnuPG kljuÄa."
diff --git a/hu/LC_MESSAGES/bridgedb.po b/hu/LC_MESSAGES/bridgedb.po
index 9ae0779..bc90c5a 100644
--- a/hu/LC_MESSAGES/bridgedb.po
+++ b/hu/LC_MESSAGES/bridgedb.po
@@ -14,7 +14,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-17 19:45+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: benewfy <benewfy at gmail.com>\n"
"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
"MIME-Version: 1.0\n"
diff --git a/ia/LC_MESSAGES/bridgedb.po b/ia/LC_MESSAGES/bridgedb.po
index c8e5753..cc81a61 100644
--- a/ia/LC_MESSAGES/bridgedb.po
+++ b/ia/LC_MESSAGES/bridgedb.po
@@ -6,14 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Interlingua (http://www.transifex.com/projects/p/torproject/language/ia/)\n"
+"Language-Team: Interlingua (http://www.transifex.com/otf/torproject/language/ia/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ia\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -28,57 +29,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Seliger omne"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -89,7 +215,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,7 +226,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -112,7 +238,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -121,20 +247,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -142,12 +268,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -155,48 +281,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -205,21 +331,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -227,153 +353,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Seliger omne"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/id/LC_MESSAGES/bridgedb.po b/id/LC_MESSAGES/bridgedb.po
index 91d5e0e..b98eeaf 100644
--- a/id/LC_MESSAGES/bridgedb.po
+++ b/id/LC_MESSAGES/bridgedb.po
@@ -7,7 +7,7 @@
# Astryd Viandila Dahlan <astrydviandila at yahoo.com>, 2015
# cholif yulian <cholifyulian123 at gmail.com>, 2015
# constantius damar wicaksono <constantiusdamar at gmail.com>, 2015
-# Dwi Cahyono, 2015
+# Dwi Cahyono <dwexz_cie at yahoo.com>, 2015
# Ferriandy Chianiago <gpl4all at gmail.com>, 2015
# MasIs <is.roadster at gmail.com>, 2013
# L1Nus <multazam_ali at me.com>, 2014
@@ -19,7 +19,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-25 02:58+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Ferriandy Chianiago <gpl4all at gmail.com>\n"
"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
"MIME-Version: 1.0\n"
diff --git a/is/LC_MESSAGES/bridgedb.po b/is/LC_MESSAGES/bridgedb.po
index a1d8368..a36501e 100644
--- a/is/LC_MESSAGES/bridgedb.po
+++ b/is/LC_MESSAGES/bridgedb.po
@@ -6,16 +6,17 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Icelandic (http://www.transifex.com/projects/p/torproject/language/is/)\n"
+"Language-Team: Icelandic (http://www.transifex.com/otf/torproject/language/is/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: is\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
@@ -28,57 +29,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nei"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -89,7 +215,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,7 +226,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -112,7 +238,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -121,20 +247,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -142,12 +268,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -155,48 +281,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -205,21 +331,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -227,153 +353,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nei"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/it/LC_MESSAGES/bridgedb.po b/it/LC_MESSAGES/bridgedb.po
index 57171ea..dd50a84 100644
--- a/it/LC_MESSAGES/bridgedb.po
+++ b/it/LC_MESSAGES/bridgedb.po
@@ -22,7 +22,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-11-15 13:58+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Alberto <alberto.pilato at gmail.com>\n"
"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
"MIME-Version: 1.0\n"
diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po
index c1dbb63..b1ddf37 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/LC_MESSAGES/bridgedb.po
@@ -12,14 +12,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-08-29 06:12+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: ABE Tsunehiko\n"
"Language-Team: Japanese (http://www.transifex.com/otf/torproject/language/ja/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -34,57 +35,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "申ã—訳ã‚ã‚Šã¾ã›ã‚“ãŒã€ãƒªã‚¯ã‚¨ã‚¹ãƒˆã«å•é¡ŒãŒã‚ã‚Šã¾ã—ãŸã€‚"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ãƒã‚°ã‚’å ±å‘Šã™ã‚‹"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ソースコード"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "変更履æ´"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ãŠå•ã„åˆã‚ã›"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ã™ã¹ã¦é¸æŠž"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR コードを表示"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "ã‚ãªãŸã®ãƒ–リッジライン㮠QR コード"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "ãŠã£ã¨ã‚¹ãƒ‘ゲッティï¼"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR コードを作æˆã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "ã“ã® QR コードã¯ã‚ãªãŸã®ãƒ–リッジラインをå«ã¿ã¾ã™ã€‚æºå¸¯ç«¯æœ«ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ã§èªã¿è¾¼ã‚€ã“ã¨ã§ã€ãƒ–リッジラインをコピーã§ãã¾ã™ã€‚"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "今ã®æ™‚点ã§ã¯åˆ©ç”¨ã§ãるブリッジãŒã‚ã‚Šã¾ã›ã‚“..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "ãŠãらã 〠%s 戻ã£ã¦ %s ç•°ãªã‚‹ãƒ–リッジタイプをé¸æŠžã—ã¦ã¿ã‚‹ã¹ãã§ã—ょã†ã€‚"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ステップ %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s をダウンãƒãƒ¼ãƒ‰"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ステップ %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s ブリッジ %s を手ã«å…¥ã‚Œã‚‹"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "ステップ %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "%s Tor Browser ã«ãƒ–ãƒªãƒƒã‚¸ã‚’è¿½åŠ ã—ã¾ã™ %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sã‚%sã®ã€ãã ã•ã„〠bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "高度ãªè¨å®š"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ã„ã„ãˆ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ãªã—"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯è‡ªå‹•é€ä¿¡ã•ã‚ŒãŸãƒ¡ãƒƒã‚»ãƒ¼ã‚¸ã§ã™ã€‚返信ã—ãªã„ã§ãã ã•ã„。]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "ã‚ãªãŸã®ãƒ–リッジã¯ã“ã¡ã‚‰:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "レート制é™ã‚’超éŽã—ã¾ã—ãŸã€‚メール間ã®æœ€å°æ™‚間㯠%s 時間ã§ã™ã€‚ã“ã®æœŸé–“ä¸ã«ã•ã‚‰ã«é€ä¿¡ã—ãŸãƒ¡ãƒ¼ãƒ«ã¯å…¨ã¦ç„¡è¦–ã•ã‚Œã¾ã™ã€‚"
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "コマンド: (コマンドを組ã¿åˆã‚ã›ã¦ã€åŒæ™‚ã«è¤‡æ•°ã®ã‚ªãƒ—ションを指定ã™ã‚‹)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB ã¸ã‚ˆã†ã“ãï¼"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "ç¾åœ¨ã‚µãƒãƒ¼ãƒˆã•ã‚Œã¦ã„るトランスãƒãƒ¼ãƒˆã‚¿ã‚¤ãƒ—:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "ã©ã†ã‚‚ %s ã•ã‚“ï¼"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "ã©ã†ã‚‚ã€ã“ã‚“ã«ã¡ã¯ï¼"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -95,7 +221,7 @@ msgstr "ã“ã®ãƒ¡ãƒ¼ãƒ«ã¯ %s ã« %s %s ã« rainbow åŠã³ unicorn 〠sparkle
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -106,7 +232,7 @@ msgid ""
msgstr "BridgeDB ã¯ã€%sタイプ㮠Pluggable Transports%s ã§ãƒ–リッジをæä¾›ã—ã¾ã™ã€‚\nTor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®æŽ¥ç¶šã‚’悟られã¥ã‚‰ãã™ã‚‹ã“ã¨ã«å½¹ç«‹ã¡ã€ã‚ãªãŸã®\nインターãƒãƒƒãƒˆãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚’監視ã—ã¦ã„る誰ã‹ãŒã‚ãªãŸãŒ Tor を使用ã—ã¦ã„ã‚‹ã“ã¨ã‚’判別ã™ã‚‹ã“ã¨ãŒã•ã‚‰ã«é›£ã—ããªã‚Šã¾ã™ã€‚\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -118,7 +244,7 @@ msgstr "IPv6 ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã®ãƒ–リッジも利用ã§ãã‚‹ã‚‚ã®ãŒã‚ã‚Šã¾
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -127,20 +253,20 @@ msgid ""
"\n"
msgstr "åŠ ãˆã¦ã€ BridgeDB ã¯ã€ %s Pluggable Transport %s ã®ãªã„多ãã®ä½•ã®å¤‰å“²ã‚‚ãªã„\n通常ã®ãƒ–リッジをæŒã¡ã€ãã‚Œã¯ã‚¯ãƒ¼ãƒ«ã«ã¯æ€ãˆãªã„ã‹ã‚‚ã—ã‚Œã¾ã›ã‚“。ã—ã‹ã—ã€å¤šãã®å ´åˆã€ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆæ¤œé–²ã‚’回é¿ã™ã‚‹ã®ã«ãªãŠæœ‰åŠ¹ã§ã™ã€‚\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "ブリッジã¨ã¯ï¼Ÿ"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s ブリッジ %s ã¯ã€ インターãƒãƒƒãƒˆæ¤œé–²ã‚’回é¿ã™ã‚‹åŠ©ã‘ã¨ãªã‚‹ Tor リレーã§ã™ã€‚"
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "ブリッジを得る他ã®æ–¹æ³•ãŒå¿…è¦ã§ã™!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,12 +274,12 @@ msgid ""
"%s, %s or %s."
msgstr "ブリッジを入手ã™ã‚‹åˆ¥ã®ã‚„り方㯠%s ã¾ã§ãƒ¡ãƒ¼ãƒ«ã‚’é€ã‚‹ã“ã¨ã§ã™ã€‚\n以下ã®ãƒ¡ãƒ¼ãƒ«ãƒ—ãƒãƒã‚¤ãƒ€ã®ã†ã¡ã®1ã¤ã®ã‚¢ãƒ‰ãƒ¬ã‚¹ã‚’使用ã—ã¦ãƒ¡ãƒ¼ãƒ«ã‚’é€ä¿¡ã—ãªã‘ã‚Œã°ãªã‚‰ãªã„ã“ã¨ã«ã”注æ„ãã ã•ã„:\n %s 〠%s ã¾ãŸã¯ %s"
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "ç§ã®ãƒ–リッジãŒå‹•ãã¾ã›ã‚“! 助ã‘ã¦ãã ã•ã„!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Tor ãŒã†ã¾ã動作ã—ãªã„å ´åˆã€ %s ã¾ã§ãƒ¡ãƒ¼ãƒ«ã‚’下ã•ã„。"
@@ -161,48 +287,48 @@ msgstr "Tor ãŒã†ã¾ã動作ã—ãªã„å ´åˆã€ %s ã¾ã§ãƒ¡ãƒ¼ãƒ«ã‚’下ã•ã„
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list 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:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "ã‚ãªãŸã®ãƒ–リッジラインã¯ã“ã¡ã‚‰ã§ã™:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "ブリッジを入手ï¼"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "ブリッジタイプã®ã‚ªãƒ—ションをé¸æŠžã—ã¦ãã ã•ã„:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 アドレスãŒå¿…è¦ã§ã™ã‹ï¼Ÿ"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "%s ãŒå¿…è¦ã§ã™ã‹ï¼Ÿ"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "ã”利用ã®ãƒ–ラウザã¯é©åˆ‡ã«ç”»åƒã‚’表示ã—ã¦ã„ã¾ã›ã‚“。"
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "上記ã®ç”»åƒã‹ã‚‰æ–‡å—を入力ã—ã¦ãã ã•ã„..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "ブリッジ使用ã®å§‹ã‚æ–¹"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -211,21 +337,21 @@ msgid ""
msgstr "Tor Browser ã«ãƒ–リッジを登録ã™ã‚‹å‰ã«ã€ã¾ãšã¯ %s Tor Browser ダウンãƒãƒ¼ãƒ‰ãƒšãƒ¼ã‚¸ %s ã«ç§»å‹•ã—㦠Tor Browser ã®ãƒ€ã‚¦ãƒ³ãƒãƒ¼ãƒ‰æ–¹æ³•ã¨å§‹ã‚æ–¹ã®èª¬æ˜Žã‚’ã”覧ãã ã•ã„。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "「Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¨å®šã€ãƒ€ã‚¤ã‚¢ãƒã‚°ãŒãƒãƒƒãƒ—アップã—ãŸéš›ã€è¨å®šã‚’クリックã—ã¦\nèžã‹ã‚Œã‚‹ã¾ã§ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰ã«å¾“ã£ã¦ãã ã•ã„。"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "ã”利用ã®ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã‚µãƒ¼ãƒ“スプãƒãƒã‚¤ãƒ€ãƒ¼ (ISP) 㯠Tor ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®æŽ¥ç¶šã‚’ブãƒãƒƒã‚¯ãªã„ã—\n別ã®ã‚„ã‚Šæ–¹ã§æ¤œé–²ã—ã¦ã„ã¾ã™ã‹ï¼Ÿ"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -233,153 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "「ã¯ã„ã€ã‚’é¸æŠžã—ã¦ã€ã€Œæ¬¡ã€ã‚’クリックã—ã¦ãã ã•ã„。新ã—ã„ブリッジを構æˆã™ã‚‹ãŸã‚ã«ã€ãƒ†ã‚スト\n入力ボックスã«ãƒ–リッジラインをコピーペーストã—ã¦ãã ã•ã„。最後ã«ã€ã€ŒæŽ¥ç¶šã€ã‚’クリックã—ã¦ã€\nã•ã‚準備ãŒå‡ºæ¥ãŸã¯ãšã§ã™ï¼ä½•ã‹å•é¡ŒãŒã‚ã£ãŸã‚‰ã€ã•ã‚‰ãªã‚‹åŠ©ã‘ã‚’å¾—ã‚‹ãŸã‚ã«ã€ŒTor\nãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯è¨å®šã€ã‚¦ã‚£ã‚¶ãƒ¼ãƒ‰å†…「ヘルプã€ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。"
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "ã“ã®ç”»åƒã‚’表示"
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "vanilla ブリッジをリクエスト"
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 ブリッジをリクエスト"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "タイプã”ã¨ã« Pluggable Transport をリクエスト"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "BridgeDB ã® GnuPG 公開éµã®ã‚³ãƒ”ーを手ã«å…¥ã‚Œã¾ã—ょã†ã€‚"
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "ãƒã‚°ã‚’å ±å‘Šã™ã‚‹"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "ソースコード"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "変更履æ´"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "ãŠå•ã„åˆã‚ã›"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "ã™ã¹ã¦é¸æŠž"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QR コードを表示"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "ã‚ãªãŸã®ãƒ–リッジライン㮠QR コード"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "ãŠã£ã¨ã‚¹ãƒ‘ゲッティï¼"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "QR コードを作æˆã™ã‚‹éš›ã«ã‚¨ãƒ©ãƒ¼ãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚"
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "ã“ã® QR コードã¯ã‚ãªãŸã®ãƒ–リッジラインをå«ã¿ã¾ã™ã€‚æºå¸¯ç«¯æœ«ãªã©ã®ãƒ‡ãƒã‚¤ã‚¹ã§èªã¿è¾¼ã‚€ã“ã¨ã§ã€ãƒ–リッジラインをコピーã§ãã¾ã™ã€‚"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "今ã®æ™‚点ã§ã¯åˆ©ç”¨ã§ãるブリッジãŒã‚ã‚Šã¾ã›ã‚“..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "ãŠãらã 〠%s 戻ã£ã¦ %s ç•°ãªã‚‹ãƒ–リッジタイプをé¸æŠžã—ã¦ã¿ã‚‹ã¹ãã§ã—ょã†ã€‚"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "ステップ %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s をダウンãƒãƒ¼ãƒ‰"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "ステップ %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s ブリッジ %s を手ã«å…¥ã‚Œã‚‹"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "ステップ %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "%s Tor Browser ã«ãƒ–ãƒªãƒƒã‚¸ã‚’è¿½åŠ ã—ã¾ã™ %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sã‚%sã®ã€ãã ã•ã„〠bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "高度ãªè¨å®š"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "ã„ã„ãˆ"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
diff --git a/ka/LC_MESSAGES/bridgedb.po b/ka/LC_MESSAGES/bridgedb.po
index c4ff08f..3bc71a6 100644
--- a/ka/LC_MESSAGES/bridgedb.po
+++ b/ka/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-02-06 12:31+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Shanidze <sandro.shanidze at gmail.com>\n"
"Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
"MIME-Version: 1.0\n"
diff --git a/kk/LC_MESSAGES/bridgedb.po b/kk/LC_MESSAGES/bridgedb.po
index 1971ca3..56f0b80 100644
--- a/kk/LC_MESSAGES/bridgedb.po
+++ b/kk/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Kazakh (http://www.transifex.com/projects/p/torproject/language/kk/)\n"
+"Language-Team: Kazakh (http://www.transifex.com/otf/torproject/language/kk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: kk\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Кешіріңіз, Ñіздің ÑураныÑыңыз бойынша белгіÑіз қиыншылықтар бар. "
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Қадам %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s жүктеу"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Қадам %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s көпірлерді %s алу"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Қадам %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Енді %s Tor Brouser-ге көпірлерді қоÑу %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust көпірлерді маған беріңіз! "
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Толық параметрлер"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Жоқ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Жоқ"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set Көпір "
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Бұл автоматты түрдегі хат, бұған жауап бермеуіңізді Ñұраймыз.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Мында Ñіздің көпірлеріңіз:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Сіз жылдамдық щегінен аÑып кеттіңіз. Өтінеміз, жылдамдықты азайтыңыз! Хаттардың аралығындағы ең қыÑқа уақыт %s шаманы құрайды. Сол уақыт аралығындағы хаттардың барлығы еленбейді. "
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: бірнеше варианттарды қатар таңдау үшін коммандаларды біріктіру, "
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB-ге қош келдіңіз!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Қазіргі кезде қолдауда келеÑÑ– TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Әй, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Сәлем, доÑым!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Көпірлер дегеніміз не?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Көпірлер алудың маған баÑқа жолы керек!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Менің көпірлерім Ð¶Ò±Ð¼Ñ‹Ñ Ñ–Ñтемейді! Көмек қажет!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -157,48 +283,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Қадам %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s жүктеу"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Қадам %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s көпірлерді %s алу"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Қадам %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Енді %s Tor Brouser-ге көпірлерді қоÑу %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust көпірлерді маған беріңіз! "
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Толық параметрлер"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Жоқ"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set Көпір "
diff --git a/km/LC_MESSAGES/bridgedb.po b/km/LC_MESSAGES/bridgedb.po
index 326e72d..54ecaac 100644
--- a/km/LC_MESSAGES/bridgedb.po
+++ b/km/LC_MESSAGES/bridgedb.po
@@ -10,14 +10,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n"
+"Language-Team: Khmer (http://www.transifex.com/otf/torproject/language/km/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -32,57 +33,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "សូមទោស! អ្វី​មួយ​មាន​កំហុស​ជាមួយ​សំណើ​របស់​អ្នក។"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "របាយការណáŸâ€‹áž€áŸ†áž ុស"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "កូដ​ប្រភព"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ទំនាក់ទំនង"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Uh oh, spaghettios!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "បច្ចុប្បន្ន​មិន​មាន​ប៊្រីដ្យ​មួយ​ចំនួន​ឡើយ..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " ប្រហែល​ជា​អ្នក​គួរážáŸ‚​ព្យាយាម %s ážáŸ’រឡប់​ទៅ​កាន់ %s ហើយ​ជ្រើស​ប្រភáŸáž‘​ប្រ៊ីដ្យ​ផ្សáŸáž„!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ជំហាន %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ទាញ​យក %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ជំហាន %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "យក %s ប្រ៊ីដ្យ %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "ជំហាន %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "ឥឡូវ​ %s បន្ážáŸ‚ម​ប៊្រីដ្យ​ទៅ​កាន់ Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust ផ្ដល់​ឲ្យ​ážáŸ’ញុំ​នូវ​ប៊្រីដ្យ!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "ជម្រើស​កម្រិážâ€‹ážáŸ’ពស់"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "áž‘áŸ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "គ្មាន"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set ប៊្រីដ្យ"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[áž“áŸáŸ‡â€‹áž‡áž¶â€‹ážŸáž¶ážšâ€‹ážŸáŸ’ážœáŸáž™áž”្រវážáŸ’ážáž·; សូម​កុំ​ឆ្លើយážáž”។]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹áž”៊្រីដ្យ​របស់​អ្នក៖"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "You have exceeded the rate limit. Please slow down! The minimum time between\nemails is %s hours. All further emails during this time period will be ignored."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "ស្វាគមនáŸâ€‹áž˜áž€áž€áž¶áž“់ BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "បច្ចុប្បន្ន​ករ​ផ្ទáŸážšâ€‹áž”ាន​គាំទ្រ TYPEs ៖"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "áž áŸ, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "សួស្ដី, មិážáŸ’ážáž—áŸáž€áŸ’ដិ!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -93,7 +219,7 @@ msgstr "អ៊ីមែល​នáŸáŸ‡â€‹ážáŸ’រូវ​បាន​បង្
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -104,7 +230,7 @@ msgid ""
msgstr "BridgeDB មិន​អាច​ផ្ដល់​ប៊្រីដ្យ​ជាមួយ​ប្រភáŸáž‘ %stypes មួយ​ចំនួន​នៃ Pluggable Transports%s,\nដែល​អាច​ជួយ obfuscate ការ​ážáž—្ជាប់​របស់​អ្នក​ទៅ​កាន់​បណ្ដាញ Tor , ធ្វើ​ឲ្យ​វា​មាន​ភាព​ពិបាក​សម្រាប់​​មើល​ចរាចរណáŸâ€‹ážšáž”ស់​អ្នក​ក្នុង​ការ​កំណážáŸ‹â€‹ážáž¶â€‹áž¢áŸ’នក​កំពុង​ប្រើ Tor ។\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -116,7 +242,7 @@ msgstr "Some bridges with IPv6 addresses are also available, though some Pluggab
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -125,20 +251,20 @@ 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:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "ážáž¾â€‹áž”្រ៊ីដ្យ​​ជា​អ្វី?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, 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:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "ážáŸ’ញុំ​ážáŸ’រូវការ​វិធីសាស្ážáŸ’រ​ឆ្លាស់គ្នា​នៃ​ការ​ទទួល​បាន​ប្រ៊ីដ្យ!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -146,12 +272,12 @@ msgid ""
"%s, %s or %s."
msgstr "វិធីមួយ​ទៀážâ€‹ážŠáž¾áž˜áŸ’បីទទួល bridges គឺ​ážáŸ’រូវ​ផ្ញើ​អ៊ីមែល​ទៅ %s ។ សូម​ចំណាំ​ážáž¶ អ្នកážáŸ’រូវ​ážáŸ‚​ផ្ញើ​អ៊ីមែល​ដោយ​ប្រើអាសយដ្ឋាន​ពី​ក្រុមហ៊ុន​ផ្ដល់អ៊ីមែល​មួយ​ក្នុង​ចំណោម​ក្រុមហ៊ុន​ážáž¶áž„​ក្រោម៖\n%s, %s ឬ %s ។"
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "ប្រ៊ីដ្យ​​របស់​ážáŸ’ញុំ​មិន​ដំណើរការ! ážáŸ’ញុំ​ážáŸ’រូវការ​ជំនួយ!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "ប្រសិនបើ Tor របស់​អ្នក​មិន​ដំណើរការ, អ្នក​គួរážáŸ‚​អ៊ីមែល %s ។"
@@ -159,48 +285,48 @@ msgstr "ប្រសិនបើ Tor របស់​អ្នក​មិន​
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list 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:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "áž“áŸáŸ‡â€‹áž‡áž¶â€‹ážáŸ†ážŽâ€‹áž”៊្រីដ្យ​របស់​អ្នក៖"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "ទទួល​យក​ប៊្រីដ្យ!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "សូម​ជ្រើស​ជម្រើស​សម្រាប់​ប្រភáŸáž‘​ប៊្រីដ្យ៖"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "ážáž¾â€‹áž¢áŸ’នក​ážáŸ’រូវ​ការ​អាសយដ្ឋាន IPv6 ឬ?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "ážáž¾â€‹áž¢áŸ’នក​ážáŸ’រូវ​ការ %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "កម្មវិធី​អ៊ីនធឺណិážâ€‹ážšáž”ស់​អ្នក​​មិន​កំពុង​បង្ហាញ​រូបភាព​ដោយ​ážáŸ’រឹមážáŸ’រូវ​ឡើយ។"
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "បញ្ចូល​ážáž½â€‹áž¢áž€áŸ’សរ​ពី​រូបភាព​ážáž¶áž„លើ..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "របៀប​ចាប់ផ្ដើម​ប្រើ​ប៊្រីដ្យ​របស់​អ្នក"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -209,21 +335,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "នៅ​ពáŸáž›â€‹áž”្រអប់​ 'ការ​កំណážáŸ‹â€‹áž”ណ្ដាញ' áž›áŸáž…​ឡើង, ចុច 'កំណážáŸ‹â€‹ážšáž…នាសម្ពáŸáž“្ធ' និង​អនុវážáŸ’ážâ€‹áž¢áŸ’នក​ជំនួយការ​រហូážâ€‹ážŠáž›áŸ‹â€‹áž—ារកិច្ច​របស់​អ្នក៖"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
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?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -231,153 +357,28 @@ 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:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "បង្ហាញ​សារ​នáŸáŸ‡áŸ”"
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "ស្នើ​ប៊្រីដ្យ​មូលដ្ឋាន។"
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "ស្នើ​ប៊្រីដ្យ IPv6 ។"
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "ស្នើ​ការ​ផ្ទáŸážšâ€‹ážŠáŸ‚ល​អាច​ដោážâ€‹áž”ាន​ážáž¶áž˜â€‹ážšáž™áŸˆ TYPE ។"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
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:89
-msgid "Report a Bug"
-msgstr "របាយការណáŸâ€‹áž€áŸ†áž ុស"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "កូដ​ប្រភព"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "ទំនាក់ទំនង"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "បច្ចុប្បន្ន​មិន​មាន​ប៊្រីដ្យ​មួយ​ចំនួន​ឡើយ..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " ប្រហែល​ជា​អ្នក​គួរážáŸ‚​ព្យាយាម %s ážáŸ’រឡប់​ទៅ​កាន់ %s ហើយ​ជ្រើស​ប្រភáŸáž‘​ប្រ៊ីដ្យ​ផ្សáŸáž„!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "ជំហាន %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "ទាញ​យក %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "ជំហាន %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "យក %s ប្រ៊ីដ្យ %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "ជំហាន %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "ឥឡូវ​ %s បន្ážáŸ‚ម​ប៊្រីដ្យ​ទៅ​កាន់ Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust ផ្ដល់​ឲ្យ​ážáŸ’ញុំ​នូវ​ប៊្រីដ្យ!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "ជម្រើស​កម្រិážâ€‹ážáŸ’ពស់"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "áž‘áŸ"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set ប៊្រីដ្យ"
diff --git a/kn/LC_MESSAGES/bridgedb.po b/kn/LC_MESSAGES/bridgedb.po
index 25ff935..7bf0778 100644
--- a/kn/LC_MESSAGES/bridgedb.po
+++ b/kn/LC_MESSAGES/bridgedb.po
@@ -9,14 +9,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-11 17:24+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Arun M S <arunistheking at yahoo.co.in>\n"
-"Language-Team: Kannada (http://www.transifex.com/projects/p/torproject/language/kn/)\n"
+"Language-Team: Kannada (http://www.transifex.com/otf/torproject/language/kn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: kn\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -31,57 +32,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "ಕà³à²·à²®à²¿à²¸à²¿, ನಿಮà³à²® ಕೋರಿಕೆಯಲà³à²²à²¿ à²à²¨à³†à³‚ೕ ತಪà³à²ªà²¾à²¯à²¿à²¤à³"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ಪಡೆಯಿರಿ %s ಬà³à²°à²¿à²¡à³à²œà³â€Œà²—ಳೠ%s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ಇಲà³à²²"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "ನಮಸà³à²•à²¾à²° %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "ನಮಸà³à²•à²¾à²°, ಮಿತà³à²°à²°à³†!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -92,7 +218,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,7 +229,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -115,7 +241,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -124,20 +250,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "ಬà³à²°à²¿à²¡à³à²œà³ ಗಳೠಅಂದರೆ à²à²¨à³?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "ನನಗೆ ಬà³à²°à²¿à²¡à³à²œà³â€Œà²—ಳೠಸಿಗà³à²µ ಬದಲಿ ಮಾರà³à²— ಬೇಕà³"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -145,12 +271,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "ನನà³à²¨ ಬà³à²°à²¿à²¡à³à²œà³â€Œà²—ಳೠಕೆಲಸ ಮಾಡà³à²¤à²¿à²²à³à²². ಸಹಾಯ ಮಾಡಿ"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "ಟಾರೠಚಲನೆಯಾಗದಿದà³à²¦à²°à³†, ನೀವೠ%s ಗೆ ಇಮೇಲೠಕಳà³à²¹à²¿à²¸à²¬à³†à²•à³"
@@ -158,48 +284,48 @@ msgstr "ಟಾರೠಚಲನೆಯಾಗದಿದà³à²¦à²°à³†, ನೀವೠ%s
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "ನಿಮಗೆ IPv6 ವಿಳಾಸ ಅವಶà³à²¯à²µà²¿à²¦à³†à²¯à²¾?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "ನಿಮಗೆ %s ಅವಶà³à²¯à²µà²¿à²¦à³†à²¯à²¾?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -208,21 +334,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -230,153 +356,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ಪಡೆಯಿರಿ %s ಬà³à²°à²¿à²¡à³à²œà³â€Œà²—ಳೠ%s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "ಇಲà³à²²"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/ko/LC_MESSAGES/bridgedb.po b/ko/LC_MESSAGES/bridgedb.po
index f151c48..c02ae96 100644
--- a/ko/LC_MESSAGES/bridgedb.po
+++ b/ko/LC_MESSAGES/bridgedb.po
@@ -20,7 +20,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-04 14:28+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Chris Park <utopinator at gmail.com>\n"
"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
"MIME-Version: 1.0\n"
diff --git a/ko_KR/LC_MESSAGES/bridgedb.po b/ko_KR/LC_MESSAGES/bridgedb.po
index 2a305d6..d3a8d7f 100644
--- a/ko_KR/LC_MESSAGES/bridgedb.po
+++ b/ko_KR/LC_MESSAGES/bridgedb.po
@@ -6,14 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Korean (Korea) (http://www.transifex.com/otf/torproject/language/ko_KR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ko_KR\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -28,57 +29,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ëª¨ë‘ ê³ ë¥´ê¸°"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "아니오"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -89,7 +215,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,7 +226,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -112,7 +238,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -121,20 +247,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -142,12 +268,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -155,48 +281,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -205,21 +331,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -227,153 +353,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "ëª¨ë‘ ê³ ë¥´ê¸°"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "아니오"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/ku/LC_MESSAGES/bridgedb.po b/ku/LC_MESSAGES/bridgedb.po
index 9d61060..bed94ce 100644
--- a/ku/LC_MESSAGES/bridgedb.po
+++ b/ku/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Kurdish (http://www.transifex.com/projects/p/torproject/language/ku/)\n"
+"Language-Team: Kurdish (http://www.transifex.com/otf/torproject/language/ku/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ku\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Bibore! Tiştek çewt qewimî."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ev mesajekî otomatîk e; ji kerema xwe re bersiv nede.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Silav, heval!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr ""
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/ku_IQ/LC_MESSAGES/bridgedb.po b/ku_IQ/LC_MESSAGES/bridgedb.po
index 31f0d98..f8405da 100644
--- a/ku_IQ/LC_MESSAGES/bridgedb.po
+++ b/ku_IQ/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-02 05:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Jaza Abdullah <jazamahmood at gmail.com>\n"
"Language-Team: Kurdish (Iraq) (http://www.transifex.com/otf/torproject/language/ku_IQ/)\n"
"MIME-Version: 1.0\n"
diff --git a/la/LC_MESSAGES/bridgedb.po b/la/LC_MESSAGES/bridgedb.po
index ca7e389..9c3f1c4 100644
--- a/la/LC_MESSAGES/bridgedb.po
+++ b/la/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-11-08 20:50+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Тихон Давыдов <tychondavydov at gmail.com>\n"
"Language-Team: Latin (http://www.transifex.com/otf/torproject/language/la/)\n"
"MIME-Version: 1.0\n"
diff --git a/lb/LC_MESSAGES/bridgedb.po b/lb/LC_MESSAGES/bridgedb.po
index 04fd50a..058cf89 100644
--- a/lb/LC_MESSAGES/bridgedb.po
+++ b/lb/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-09-22 17:39+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Tyler Durden <virii at enn.lu>\n"
"Language-Team: Luxembourgish (http://www.transifex.com/otf/torproject/language/lb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: lb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Entschëllegt! Et ass eppes falsch mat ärer Ufro."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "E Feeler mellen"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Quellcode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Ännerungsprotokoll"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Alles auswielen"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QRCode uweisen"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "De QRCode fir är Brécken-Server Adressen"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oh oh, hei ass eng schif gaang!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Et gesäit sou aus als wär e Feeler geschitt bei ärem QRCode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Dësen QrCode enthält är Brécken-Server Adressen. Scannt en mam engem QRCode Lieser a kopéiert domadder är Adressen op aner mobil Geräter."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Momentan si keng Brécken-Server disponibel..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Villäicht sollt dir probéieren %s zeréck ze goen %s an een anere Bréckentyp auszewielen!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Schrëtt %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "%s Tor Browser %s eroflueden"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Schrëtt %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Erhal Adressen vu %s Brécken-Server %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Schrëtt %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Lo %s Brécken-Server Adressen dem Tor Browser bäifügen %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sG%sëff mer Brécken-Server!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Erweidert Optiounen"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nee"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "keng"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%so!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sE%srhal Adressen vu Brécken-Server!"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Dat heiten ass eng automatesch Noriicht. Wann ech gelift net drop äntweren.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Hei sinn deng Brécken-Server:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Dir huet de Grenzwäert iwwerschratt. Wann ech gelift méi lues! De klengsten Ofstand zwëschent den E-Mails bedréit %s Stonnen. All weider E-Mail während dëser Zäit, gëtt ignoréiert."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "BEFEHLER: (Kombinéiert BEFEHLER em méi Méiglechkeeten gläichzäiteg unzeginn)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Wëllkomm bei der Bréckendatebank!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Momentan ënnerstëtzt Transportypen:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Moien, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Moien, Frënd!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Ëffentlech Schlësselen"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr "Des E-Mail gouf fir dech, %s op %s em %s mat Reebéi, Eenhaaren\nan Glit
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr "BridgeDB oder Bréckendatebank kann verschidden %stypen vun Pluggable Transports%s\nbereedstellen. Déi kennen hëllefen är Connectioun zum Tor Netzwierk ze verschleieren. \nDoduerch gëtt et méi schwéier eraus ze fannen op dir Tor benotzt.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr "E puer Brécken-Server sinn via IPv6 ze areechen, leider si verschidden
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr "Zousätzlech huet d'BridgeDB och nach eng sëllech hierkëmmlech Brécken-Server %s, déi ouni\nPluggable Transports %s dohierkommen. Dat klengt zwar net deck, mä déi kënnen dacks\nnach ëmmer hëllefen eng Internetzensur ze ëmgoen.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Wat si Brécken?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Brécken-Server %s sinn Tor-Relaisen, déi iech dobäi hëllefen d'Zensur ze ëmgoen."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Ech brauch eng alternativ Aart a Weis fir u Brécken-Server ze kommen!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr "Een anere Wee fir un Brécken-Server ze kommen, ass fir eng E-Mail un %s ze schécken.\nWann ech gelift, passt op datt dir eng E-Mail vun engem vun dësen Mail Provider musst verschécken:\n%s, %s oder %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Meng Brécken funktionéieren net! Ech brauch Hëllef!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Wann Tor net funktionéiert, dann solls de dem %s mailen."
@@ -156,48 +282,48 @@ msgstr "Wann Tor net funktionéiert, dann solls de dem %s mailen."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Probéiert sou vill wei méiglech un Informatiounen ze ginn déi äre Fall betreffen.\nDat heescht eng Lescht vun de Brécken-Server an Pluggable Transports déi dir probéiert\nhutt, är Tor Browser Versioun, an all aner Noriicht déi iech Tor ginn huet, asw."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hei sinn är Brécken-Server Adressen:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Erhal Adressen vu Brécken-Server!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Wann ech gelift, wielt d'Optiounen fir de Bréckentyp:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Brauchs de IPv6 Adressen?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Braucht dir eng %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Äre Browser weist Biller net richteg un."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Gitt wann ech gelift d'Zeechen vum Bild uewen an."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Sou fänkt der un är Brécken ze benotzen"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr "Fir Brécken an ärem Tor Browser unzeginn, gitt der zur %s Tor Browser Downloadsäit %s\nan dann follegt den Uweisungen fir den Tor Browser ze downloaden an ze starten."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Wann den \"Tor Netzwierk Astellungen\" Dialog kennt, da klickt op \"Konfiguréieren\" an\nfollegt den Uweisunge vum Assistent:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blockéiert oder zenséiert ären Internetprovider (ISP) är Connectioun zum Tor Netzwierk?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Wielt \"Jo\" an dann klickt \"Weider\". Em är nei Brécken-Server ze konfiguréieren,\nkopéiert d'Zeilen mät den Brécken-Server Adressen an fügt se an Textfeld an.\nKlickt schlussendlech op \"Verbannen\"! Wann der Problemer hutt, dann klickt op den \"Hëllef\"\nKnäppchen am Assistent vun \"Tor Netzwierk Astellungen\", fir eng weider Hëllefstellung ze kréien."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Des Noriicht uweisen."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Standard Brécken-Server ufroen."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 Brécken ufroen."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Een Pluggable Transport vum TYPE ufroen."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Eng Kopie vum ëffentlechen GnuPG Schlëssel vun der Bréckendatebank kréien."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "E Feeler mellen"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Quellcode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Ännerungsprotokoll"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Alles auswielen"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "QRCode uweisen"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "De QRCode fir är Brécken-Server Adressen"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oh oh, hei ass eng schif gaang!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Et gesäit sou aus als wär e Feeler geschitt bei ärem QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Dësen QrCode enthält är Brécken-Server Adressen. Scannt en mam engem QRCode Lieser a kopéiert domadder är Adressen op aner mobil Geräter."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Momentan si keng Brécken-Server disponibel..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Villäicht sollt dir probéieren %s zeréck ze goen %s an een anere Bréckentyp auszewielen!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Schrëtt %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "%s Tor Browser %s eroflueden"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Schrëtt %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Erhal Adressen vu %s Brécken-Server %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Schrëtt %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Lo %s Brécken-Server Adressen dem Tor Browser bäifügen %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sG%sëff mer Brécken-Server!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Erweidert Optiounen"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nee"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "keng"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sJ%so!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sE%srhal Adressen vu Brécken-Server!"
diff --git a/lo/LC_MESSAGES/bridgedb.po b/lo/LC_MESSAGES/bridgedb.po
index 901963c..7813320 100644
--- a/lo/LC_MESSAGES/bridgedb.po
+++ b/lo/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-09-28 14:16+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Rockers <sumorock at hotmail.com>\n"
"Language-Team: Lao (http://www.transifex.com/otf/torproject/language/lo/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: lo\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "ຂà»àºàº°à»„ພ! ມີຂà»à»‰àºœàº´àº”ພາດàºàº±àºšàºàº²àº™àº®à»‰àºàº‡àº‚à»àº‚àºàº‡àº—່ານ."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ລາàºàº‡àº²àº™àºšàº±àº™àº«àº²"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "ຊàºàº£à»Œàºªà»‚ຄ້ດ"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "ບັນທຶàºàºàº²àº™àº›à»ˆàº½àº™à»àº›àº‡"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "ຕິດຕà»à»ˆ"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ເລືàºàºàº—ັງà»àº»àº”"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "ສະà»àº”ງQRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "ມັນເບິ່ງຄືວ່າມີບັນຫາໃນàºàº²àº™àº‚à»àº®àº±àºš QRCode ຂàºàº‡àº—່າ."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "ຂະນະນີ້ບà»à»ˆàº¡àºµàºšàº£àº´àº”ຈ໌ທີ່ໃຊ້ໄດ້ເລີàº..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ຂັ້ນຕàºàº™ %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ດາວໂຫຼດ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ຂັ້ນຕàºàº™ %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ເàºàº»àº² %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "ຂັ້ນຕàºàº™ %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "ຕົວເລືàºàºà»€àºžàºµà»ˆàº¡à»€àº•àºµàº¡"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ບà»à»ˆ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "ບà»à»ˆàº¡àºµàº«àºàº±àº‡"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sເ%sàºàº»àº² Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[ຂà»à»‰àº„ວາມນີ້ເປັນຂà»à»‰àº„ວາມສົ່ງມາໂດàºàºàº±àº”ຕະໂນມັດ; àºàº°àº¥àº¸àº™àº²àº¢à»ˆàº²àº•àºàºšàºàº±àºš.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "ບ່àºàº™àº™àºµà»‰àº¡àºµàº‚ົວຂàºàº‡àº—່ານ:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "ທ່ານ ເຖິງຂີດຈຳàºàº±àº”à»àº¥à»‰àº§. àºàº°àº¥àº¸àº™àº²à»€àº®àº±àº”ໃຫ້ຊົາລົງ! ເວລາຕ່ຳສຸດລະຫວ່າງàºàºµà»€àº¡àº§à»àº¡à»ˆàº™ %s ຊົ່ວໂມງ. àºàºµà»€àº¡àº§àºàº·à»ˆàº™à»†àº¥àº°àº«àº§à»ˆàº²àº‡à»€àº§àº¥àº²àº™àºµà»‰àºˆàº°àº–ືàºàºàº»àºà»€àº¥àºµàº."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "ຂà»à»‰àº•à»‰àºàº™àº®àº±àºšàºªàº¹à»ˆ BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "ເຮີàº, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "ສະບາàºàº”ີ, à»àº¹à»ˆà»€àºžàº·à»ˆàºàº™!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "ບຣິດຈ໌ à»àº¡à»ˆàº™àº«àºàº±àº‡?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "ບຣິດຈ໌ຂàºàº‡àº‚້àºàºàºšà»à»ˆà»€àº®àº±àº”ວຽàºà»€àº¥àºµàº! ຂ້àºàºàº•à»‰àºàº‡àºàº²àº™àº„ວາມຊ່ວàºà»€àº«àº¼àº·àº!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "ຖ້າຫາàºàº§à»ˆàº² Tor ຂàºàº‡àº—່ານບà»à»ˆà»€àº®àº±àº”ວຽàº, ທ່ານຄວນສົ່ງຈົດà»àº²àºà»„ປຫາ %s."
@@ -157,48 +283,48 @@ msgstr "ຖ້າຫາàºàº§à»ˆàº² Tor ຂàºàº‡àº—່ານບà»à»ˆà»€àº®àº±
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "ເàºàº»àº²àºšàº£àº´àº”ຈ໌!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "àºàº°àº¥àº¸àº™àº²à»€àº¥àº·àºàºàº•àº»àº§à»€àº¥àº·àºàºàºªàº³àº«àº¥àº±àºšàºŠàº°àº™àº´àº”ຂàºàº‡àºšàº£àº´àº”ຈ໌:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "ທ່ານຈຳເປັນຕ້àºàº‡à»ƒàºŠà»‰àº—ີ່ຢູ່ IPv6 ບà»à»‹?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "ທ່ານຈຳເປັນຕ້àºàº‡à»ƒàºŠà»‰ %s ບà»à»ˆ?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "ໂປຣà»àºàº£àº¡à»€àºšàº´à»ˆàº‡à»€àº§àº±àºšàº‚àºàº‡àº—່ານບà»à»ˆà»„ດ້ສະà»àº”ງຮູບພາບຢ່າງຖືàºàº•à»‰àºàº‡"
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "àºàº°àº¥àº¸àº™àº²àº›à»‰àºàº™à»‚ຕໜັງສື ຈາàºàº®àº¹àºšàº‚້າງເທິງ..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "ວິທີໃນàºàº²àº™à»€àº¥àºµà»ˆàº¡à»ƒàºŠà»‰àºšàº£àº´àº”ຈ໌ຂàºàº‡àº—່າ"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr "ເພື່àºàº›à»‰àºàº™àºšàº£àº´àº”ຈ໌ໄປໃສ່ Tor Browser, ຂັ້ນທຳàºàº´àº”ໃຫ້ໄປ %s Tor Browser download\npage %s à»àº¥àº°à»€àº®àº±àº”ຕາມຄຳà»àº™àº°àº™àº³à»€àºžàº·à»ˆàºàº”າວໂຫລດà»àº¥àº°à»€àº¥àºµà»ˆàº¡àº•àº»à»‰àº™à»‚ປຣà»àºàº£àº¡ Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "ເມື່àºàºà»ˆàºàº‡à»‚ຕ້ຕàºàºš 'Tor Network Settings' ຜຸດຂຶ້ນມາà»àº¥à»‰àº§, ໃຫ້ຄລິàºàº—ີ່ 'ຕັ້ງຄ່າ' à»àº¥à»‰àº§à»€àº®àº±àº”ຕາມຂັ້ນຕàºàº™ ຈົນàºàº§à»ˆàº²àº¡àº±àº™àºˆàº°àº–າມວ່າ:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "ສະà»àº”ງຂà»à»‰àº„ວາມນີ້."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "ຂà»àº®à»‰àºàº‡ IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "ລາàºàº‡àº²àº™àºšàº±àº™àº«àº²"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "ຊàºàº£à»Œàºªà»‚ຄ້ດ"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "ບັນທຶàºàºàº²àº™àº›à»ˆàº½àº™à»àº›àº‡"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "ຕິດຕà»à»ˆ"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "ເລືàºàºàº—ັງà»àº»àº”"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "ສະà»àº”ງQRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "ມັນເບິ່ງຄືວ່າມີບັນຫາໃນàºàº²àº™àº‚à»àº®àº±àºš QRCode ຂàºàº‡àº—່າ."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "ຂະນະນີ້ບà»à»ˆàº¡àºµàºšàº£àº´àº”ຈ໌ທີ່ໃຊ້ໄດ້ເລີàº..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "ຂັ້ນຕàºàº™ %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "ດາວໂຫຼດ %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "ຂັ້ນຕàºàº™ %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ເàºàº»àº² %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "ຂັ້ນຕàºàº™ %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "ຕົວເລືàºàºà»€àºžàºµà»ˆàº¡à»€àº•àºµàº¡"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "ບà»à»ˆ"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sເ%sàºàº»àº² Bridges"
diff --git a/lt/LC_MESSAGES/bridgedb.po b/lt/LC_MESSAGES/bridgedb.po
index 9369b17..8b91eab 100644
--- a/lt/LC_MESSAGES/bridgedb.po
+++ b/lt/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-18 13:20+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: AG <aiste.gvildyte at gmail.com>\n"
"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
"MIME-Version: 1.0\n"
@@ -259,11 +259,11 @@ msgstr "Kas yra tiltai?"
#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr ""
+msgstr "%s Bridges %s help circumvent censorship"
#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
-msgstr ""
+msgstr "I need an alternative way of getting bridges!"
#: bridgedb/strings.py:108
#, python-format
@@ -295,11 +295,11 @@ msgstr ""
#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
-msgstr ""
+msgstr "Here are your bridge lines:"
#: bridgedb/strings.py:129
msgid "Get Bridges!"
-msgstr ""
+msgstr "Get bridges!"
#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
diff --git a/lv/LC_MESSAGES/bridgedb.po b/lv/LC_MESSAGES/bridgedb.po
index f437b31..633c711 100644
--- a/lv/LC_MESSAGES/bridgedb.po
+++ b/lv/LC_MESSAGES/bridgedb.po
@@ -9,14 +9,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-20 10:46+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: OjÄrs Balcers <ojars.balcers at gmail.com>\n"
-"Language-Team: Latvian (http://www.transifex.com/projects/p/torproject/language/lv/)\n"
+"Language-Team: Latvian (http://www.transifex.com/otf/torproject/language/lv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
@@ -31,57 +32,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Atvainojiet! Notikusi ar Jūsu pieprasījumu saistīta kļūme."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ziņot par kļūdu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Pirmkods"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Izmaiņu žurnÄls"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "SazinÄties"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Atlasīt visu"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "ParÄdÄ«t QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode JÅ«su tiltu rindÄm"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ak, man' dieniņ!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Sķiet, ka, saņemot Jūsu QRCode, notika kļūda."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "JÅ«su tiltu rindas ir QRCode. SkenÄ“jiet to ar QRCode lasÄ«tÄju, lai iekopÄ“tu JÅ«su tiltu rindas mobilajÄ tÄlrunÄ« un citÄs iekÄrtÄs."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Šobrīd nav pieejamu tiltu..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "IespÄ“jams, ka Jums jÄmÄ“Ä£ina %s atgriezties %s un izvÄ“lÄ“ties citu tiltu veidu!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Solis %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "LejuplÄdÄ“t %s PÄrlÅ«ku Tor %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Solis %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Saņemt %s tiltus %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Solis %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Tagad %s pievienot PÄrlÅ«kam Tor tiltus %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sT%sikai dodiet man tiltus!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Lietpratēju opcijas "
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "NÄ“"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "nekas"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sJ%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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sS%saņemt tiltus"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Å is ir automÄtisks ziņojums; lÅ«dzu neatbildiet.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Te ir JÅ«su tilti:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "JÅ«s esat pÄrsniedzis pÄrraides normu. LÅ«dzu, lÄ“nÄk. MinimÄlais laika ilgums starp\ne-pastiem ir %s stundas. Å ajÄ laika posmÄ visi turpmÄkie e-pasti tiks ignorÄ“ti."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (apvienot KOMANDA's, lai vienlaicÄ«gi norÄdÄ«tu dažÄdas opcijas)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "SveicinÄti BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Šobrīd atbalstītie transporta VEIDI:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hei, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Sveiks, draug!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "PubliskÄs atslÄ“gas"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -92,7 +218,7 @@ msgstr "This email was generated with rainbows, unicorns, and sparkles\npriekš
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -103,7 +229,7 @@ msgid ""
msgstr "BridgeDB var nodroÅ¡inÄt tiltus ar dažÄdiem %stypes Pluggable Transports%s,\nkas var palÄ«dzÄ“t maskÄ“t JÅ«su savienojumu ar Tor Network, tÄdÄ“jÄdi padarot sarežģītÄk ikvienam, kas seko JÅ«su interneta datu plÅ«smai, noteikt, ka lietojat Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -115,7 +241,7 @@ msgstr "Ir pieejami daži tilti ar IPv6 adresÄ“m; tanÄ« pat laikÄ daži Pluggab
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -124,20 +250,20 @@ msgid ""
"\n"
msgstr "TurklÄt BridgeDB ir pietiekami daudz parastu, vienkÄrÅ¡u tiltu %s bez jebkÄdiem\nPluggable Transports %s, kas iespÄ“jams neizklausÄs tik inÄÄ«gi, bet arÄ« tie var\ndaudzos gadÄ«jumos palÄ«dzÄ“t apiet interneta cenzÅ«ru.\n \n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Kas ir tilti?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Tilti %s ir Tor retranslatori, kas palīdz Jums apiet cenzūru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Man nepieciešams alternatīvs tiltu iegūšanas veids!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -145,12 +271,12 @@ msgid ""
"%s, %s or %s."
msgstr "VÄ“lviens veids kÄ saņemt tiltus ir nosÅ«tÄ«t e-pastu uz %s. LÅ«dzu, ievÄ“rojiet, ka e-pasts ir\njÄnosÅ«ta no viena no sekojoÅ¡ajiem e-pasta pakalpojumu sniedzÄ“jiem:\n%s, %s vai %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mani tilti nestrÄdÄ! Man nepiecieÅ¡ama palÄ«dzÄ«ba!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Ja JÅ«su Tor nestrÄdÄ, Jums jÄnosÅ«ta e-pasts %s."
@@ -158,48 +284,48 @@ msgstr "Ja JÅ«su Tor nestrÄdÄ, Jums jÄnosÅ«ta e-pasts %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Centieties iekļaut pÄ“c iespÄ“jas daudz informÄciju par savu situÄciju, tostarp pievienojot to tiltu un Pluggable Transports sarakstu, kurus centÄties izmantot, savu Tor Browser versiju un visus Tor ziņojumus, un citu lÄ«dzÄ«gu informÄciju."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Te ir Jūsu tiltu līnijas:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Saņemt Tiltus!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Lūdzu, izvēlieties tilta veida opcijas:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Vai ir nepieciešamas IPv6 adreses?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Vai ir nepieciešams %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "JÅ«su pÄrlÅ«ks neattÄ“lo attÄ“lus pareizi."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "IevadÄ«t burtus no augstÄk parÄdÄ«tÄ attÄ“la..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "KÄ sÄkt izmantot JÅ«su tiltus"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -208,21 +334,21 @@ msgid ""
msgstr "Lai pÄrlÅ«kÄ Tor ievadÄ«tu tiltus, vispirms dodieties uz %s pÄrlÅ«ka Tor lejuplÄdes \nlapu %s un tad sekojiet pÄrlÅ«ka Tor lejupielÄdes un sÄkÅ¡anas norÄdÄ“m."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kad uznirst dialogs \"Tor tÄ«kla iestatÄ«jumi\", noklikÅ¡Ä·iniet \"KonfigurÄ“t\" un sÄ“kojiet\nvednim lÄ«dz tas jautÄ:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Vai JÅ«su Interneta pakalpojumu sniedzÄ“js (ISP) bloÄ·Ä“ vai citÄdÄ veidÄ cenzÄ“ savienojumus\nar tÄ«klu Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -230,153 +356,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Atlasiet \"JÄ\" un tad noklikÅ¡Ä·iniet \"TÄlÄk\". Lai konfigurÄ“tu savus jaunos tiltus, kopÄ“jiet un\nielÄ«mÄ“jiet tiltu lÄ«nijas teksta ievades lodziņÄ. BeigÄs nokliÅ¡Ä·iniet \"Izveidot savienojumu\" un\nvisam vajadzÄ“tu notikt! Ja ir problÄ“mas, turpmÄkai palÄ«dzÄ«bai pamÄ“Ä£iniet nokliÅ¡Ä·inÄt vednÄ« \"Tor tÄ«kla iestatÄ«jumi\" pogu \"PalÄ«dzÄ«ba\"."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "RÄda ziņojumu."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Pieprasīt parastos tiltus."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Pieprasīt IPv6 tiltus."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Pieprasīt Pluggable Transport pēc TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
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:89
-msgid "Report a Bug"
-msgstr "Ziņot par kļūdu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Pirmkods"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Izmaiņu žurnÄls"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "SazinÄties"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Atlasīt visu"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "ParÄdÄ«t QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode JÅ«su tiltu rindÄm"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ak, man' dieniņ!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Sķiet, ka, saņemot Jūsu QRCode, notika kļūda."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "JÅ«su tiltu rindas ir QRCode. SkenÄ“jiet to ar QRCode lasÄ«tÄju, lai iekopÄ“tu JÅ«su tiltu rindas mobilajÄ tÄlrunÄ« un citÄs iekÄrtÄs."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Šobrīd nav pieejamu tiltu..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "IespÄ“jams, ka Jums jÄmÄ“Ä£ina %s atgriezties %s un izvÄ“lÄ“ties citu tiltu veidu!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Solis %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "LejuplÄdÄ“t %s PÄrlÅ«ku Tor %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Solis %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Saņemt %s tiltus %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Solis %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Tagad %s pievienot PÄrlÅ«kam Tor tiltus %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sT%sikai dodiet man tiltus!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Lietpratēju opcijas "
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "NÄ“"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "nekas"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sJ%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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sS%saņemt tiltus"
diff --git a/mk/LC_MESSAGES/bridgedb.po b/mk/LC_MESSAGES/bridgedb.po
index aa81bcc..698c7e9 100644
--- a/mk/LC_MESSAGES/bridgedb.po
+++ b/mk/LC_MESSAGES/bridgedb.po
@@ -4,13 +4,13 @@
#
# Translators:
# Cacko Cackoas <cackothe at gmail.com>, 2015
-# Viktor Hristov <viktor.hr at gmail.com>, 2014
+# Viktor Hristov, 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: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-10 08:16+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Cacko Cackoas <cackothe at gmail.com>\n"
"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
"MIME-Version: 1.0\n"
diff --git a/ml/LC_MESSAGES/bridgedb.po b/ml/LC_MESSAGES/bridgedb.po
index 467c03f..1940067 100644
--- a/ml/LC_MESSAGES/bridgedb.po
+++ b/ml/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-11-23 01:43+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Salman Faris <farissalmannbr at gmail.com>\n"
"Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
"MIME-Version: 1.0\n"
diff --git a/mr/LC_MESSAGES/bridgedb.po b/mr/LC_MESSAGES/bridgedb.po
index 742e799..87a7f42 100644
--- a/mr/LC_MESSAGES/bridgedb.po
+++ b/mr/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-30 14:16+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Vikrant Korde <vikrant.korde at gmail.com>\n"
"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
"MIME-Version: 1.0\n"
diff --git a/ms_MY/LC_MESSAGES/bridgedb.po b/ms_MY/LC_MESSAGES/bridgedb.po
index 8c433df..6b298a8 100644
--- a/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/ms_MY/LC_MESSAGES/bridgedb.po
@@ -11,14 +11,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Malay (Malaysia) (http://www.transifex.com/otf/torproject/language/ms_MY/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -33,57 +34,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Dapatkan %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Tidak"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ini adalah mesej automatik; sila tidak menjawab.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Ini sambungan anda"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Awak telah sampai had yang ditetapkan. Sila perlahan! Masa minimum yang ditetapkan diantara email adalah %s jam. Semua email yang di hantar pada masa ini tidak akan dilayan"
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Selamat Datang ke BridgeDB"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hei, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Helo, kawan!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Kekunci umum"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -94,7 +220,7 @@ msgstr "Email ini dihasilkan dengan pelangi,kuda bertanduk, dan kelipan untuk %s
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,7 +231,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -117,7 +243,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -126,20 +252,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Apakah itu bridges ?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Saya perlukan cara alternatif untuk mendapatkan bridges!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -147,12 +273,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Bridges saya tidak berfungsi! Saya perlukan bantuan!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -160,48 +286,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -210,21 +336,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -232,153 +358,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Dapatkan %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Tidak"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/my/LC_MESSAGES/bridgedb.po b/my/LC_MESSAGES/bridgedb.po
index 6a5c460..e2d4ffc 100644
--- a/my/LC_MESSAGES/bridgedb.po
+++ b/my/LC_MESSAGES/bridgedb.po
@@ -6,14 +6,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Burmese (http://www.transifex.com/projects/p/torproject/language/my/)\n"
+"Language-Team: Burmese (http://www.transifex.com/otf/torproject/language/my/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: my\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -28,57 +29,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "အားလုံးကá€á€¯ ရွေးရန်"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "လက်မá€á€¶á€·á€«"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[ဒီစာသည် အလá€á€¯á€¡á€œá€»á€¾á€±á€¬á€€á€ºá€•á€á€¯á€·á€žá€Šá€·á€ºá€…ာ ဖြစ်သည့်အá€á€½á€€á€º ပြန်လည်ပေးပá€á€¯á€·á€›á€”်မလá€á€¯á€•á€« á‹]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -89,7 +215,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -100,7 +226,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -112,7 +238,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -121,20 +247,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -142,12 +268,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -155,48 +281,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -205,21 +331,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -227,153 +353,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "အားလုံးကá€á€¯ ရွေးရန်"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "လက်မá€á€¶á€·á€«"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/nb/LC_MESSAGES/bridgedb.po b/nb/LC_MESSAGES/bridgedb.po
index 2e61082..bf71f86 100644
--- a/nb/LC_MESSAGES/bridgedb.po
+++ b/nb/LC_MESSAGES/bridgedb.po
@@ -5,7 +5,7 @@
# Translators:
# Allan Nordhøy <epost at anotheragency.no>, 2014
# Erik Matson, 2015
-# Harald <haarektrans at gmail.com>, 2014
+# Harald H. <haarektrans at gmail.com>, 2014
# Kristian Andre Henriksen <kris.andre.h at gmail.com>, 2015
# lateralus, 2013
# PÃ¥l Fiksdal <plf715 at gmail.com>, 2015
@@ -16,7 +16,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-13 15:27+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: PÃ¥l Fiksdal <plf715 at gmail.com>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n"
"MIME-Version: 1.0\n"
diff --git a/nl/LC_MESSAGES/bridgedb.po b/nl/LC_MESSAGES/bridgedb.po
index aa7aa12..a9d2faa 100644
--- a/nl/LC_MESSAGES/bridgedb.po
+++ b/nl/LC_MESSAGES/bridgedb.po
@@ -20,7 +20,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-03-03 12:38+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Cleveridge <erwin.de.laat at cleveridge.org>\n"
"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
"MIME-Version: 1.0\n"
diff --git a/nl_BE/LC_MESSAGES/bridgedb.po b/nl_BE/LC_MESSAGES/bridgedb.po
index 71e0146..6998297 100644
--- a/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/nl_BE/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-08-09 14:46+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Katrien Igodt <kigodt at gmail.com>\n"
"Language-Team: Dutch (Belgium) (http://www.transifex.com/otf/torproject/language/nl_BE/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: nl_BE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Rapporteer een Bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Broncode"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacteer"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecteer Alles"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Toon QRCode"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QRCode voor uw bridge lines"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "t'Is om zeep!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Er lijkt een fout gebeurd te zijn in het verkrijgen van uw QRCode."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Deze QRCode bevat uw bridge lines. Scan deze aub met een QRCode lezer om zo uw bridge lines te kopiëren naar uw mobiele en andere toestellen. "
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Er zijn momenteel geen bridges beschikbaar. "
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Misschien moet u proberen %s even terug %s te gaan om een andere bridge type te selecteren."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Stap %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Download %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Stap %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Verkrijg %s bridges %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Stap %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sG%seef me gewoon bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Geavanceerde Opties"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nee"
+
+#: bridgedb/https/templates/options.html:87
+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."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sV%serkrijg Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Dit is een geautomatiseerd bericht; gelieve hier niet te op te antwoorden.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Hier zijn uw bridges:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "U hebt de snelheidslimiet overschreden. Gelieve langer te wachten! De minimum tijd tussen emails is %s uur. Alle verdere e-mails zullen tijdens deze tijd niet behandeld worden."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combineer COMMANDs om simultaan meerdere opties te specifiëren)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Welkom bij BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Huidige ondersteunde transporttype's:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hallo, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hallo, vriend!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr "Deze e-mail werd gegenereerd met regenbogen, eenhoorns, en glitters\nvoo
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr "BridgeDB kan bridges voorzien met verschillende %stypes Pluggable Transports%s, die kunnen helpen om uw connecties met het Tor netwerk te verduisteren, hetgeen het nog moeilijker maakt voor iemand die uw netwerktrafiek bekijkt om te zien dat u Tor gebruikt.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr "Sommige bridges met IPv6 adressen zijn ook beschikbaar, alhoewel sommige
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr "Verder heeft BridgeDB standaard bridges %s in overvloed zonder enige Pluggable Transports %s. Dit lijkt allemaal niet zo spannend, maar helpen nog steeds om in de meeste gevallen internetcensuur te omzeilen. \n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s zijn Tor relays die u helpen om censuur te omzeilen."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Ik heb een alternatieve route nodig om bridges te verkrijgen!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr "Een andere manier om bridges te verkrijgen is om een email te sturen naar %s. Gelieve zeker te zijn dat u uw e-mail verstuurt vanuit een e-mailadres van de volgende e-mail providers:\n%s, %s of %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Indien Tor niet werkt, dient u een e-mail te sturen naar %s."
@@ -156,48 +282,48 @@ msgstr "Indien Tor niet werkt, dient u een e-mail te sturen naar %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list 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 mee te geven, \nzoals de lijst van\nbridges en Pluggable Transports die u probeerde te gebruiken, de versie van uw Tor Browser,\nen de meldingen die u verkreeg van Tor, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Hier zijn uw bridge lines:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Verkrijg Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Gelieve opties te selecteren voor bridge type:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Heeft u IPv6 adressen nodig?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Heeft u een %s nodig?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Uw browser geeft afbeeldingen niet correct weer."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Voer de karakters van de afbeelding hierboven in..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Hoe beginnen met bridges te gebruiken"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr "Om bridges toe te voegen in de Tor Browser, gaat u eerst naar de %s Tor Browser download\npagina %s en volgt u daar verder instructies om de Tor Browser te downloaden en te starten."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Wanneer het 'Tor Netwerk Instellingen' dialoogvenster opent, klikt u op 'Configureer' en volgt u de wizard totdat deze vraagt: "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selecteer 'Ja' en klik vervolgens op 'Volgende'. Om uw nieuwe bridges te configureren, kopieer en plak de bridge lines in het tekst invoerveld. Tenslotte, klik 'Connecteer' en u zou moeten kunnen connecteren. Indien u toch problemen ondervindt, klik dan op de 'Help' knop in de 'Tor Netwerk Instellingen' wizard voor verdere ondersteuning."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Toont dit bericht."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Vraag standaard bridges aan."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Vraag IPv6 bridges aan."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Vraag Pluggable Transport by TYPE aan."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Verkijg een kopie van de BridgeDB's public GnuPG key."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Rapporteer een Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Broncode"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Changelog"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contacteer"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selecteer Alles"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Toon QRCode"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QRCode voor uw bridge lines"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "t'Is om zeep!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Er lijkt een fout gebeurd te zijn in het verkrijgen van uw QRCode."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Deze QRCode bevat uw bridge lines. Scan deze aub met een QRCode lezer om zo uw bridge lines te kopiëren naar uw mobiele en andere toestellen. "
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Er zijn momenteel geen bridges beschikbaar. "
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Misschien moet u proberen %s even terug %s te gaan om een andere bridge type te selecteren."
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Stap %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Download %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Stap %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Verkrijg %s bridges %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Stap %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sG%seef me gewoon bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Geavanceerde Opties"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nee"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sV%serkrijg Bridges"
diff --git a/nn/LC_MESSAGES/bridgedb.po b/nn/LC_MESSAGES/bridgedb.po
index 259f1b1..c4e96ff 100644
--- a/nn/LC_MESSAGES/bridgedb.po
+++ b/nn/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-02-10 16:06+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Bjørn I. <bjorn.svindseth at online.no>\n"
"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
"MIME-Version: 1.0\n"
diff --git a/pa/LC_MESSAGES/bridgedb.po b/pa/LC_MESSAGES/bridgedb.po
index 617d61f..897070a 100644
--- a/pa/LC_MESSAGES/bridgedb.po
+++ b/pa/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Panjabi (Punjabi) (http://www.transifex.com/otf/torproject/language/pa/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: pa\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ਨਹੀਂ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "ਪà©à¨² ਕੀ ਹਨ?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "ਨਹੀਂ"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/pl/LC_MESSAGES/bridgedb.po b/pl/LC_MESSAGES/bridgedb.po
index e210257..0738125 100644
--- a/pl/LC_MESSAGES/bridgedb.po
+++ b/pl/LC_MESSAGES/bridgedb.po
@@ -7,23 +7,24 @@
# Aron <aron.plotnikowski at cryptolab.net>, 2013
# JerBen <ayurveda63 at gmail.com>, 2012
# bogdrozd <bog.d at gazeta.pl>, 2013
-# Dawid <hoek at hoek.pl>, 2014
+# Dawid, 2014
# Rikson <Ers at mail2tor.com>, 2014
# Karol Obartuch <kobartuch at luc.edu>, 2015
# Krzysztof Åojowski <maxxxrally at gmail.com>, 2014
# oirpos <kuba2707 at gmail.com>, 2015
-# seb, 2014-2015
+# sebx, 2014-2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-16 10:48+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Karol Obartuch <kobartuch at luc.edu>\n"
-"Language-Team: Polish (http://www.transifex.com/projects/p/torproject/language/pl/)\n"
+"Language-Team: Polish (http://www.transifex.com/otf/torproject/language/pl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: pl\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -38,57 +39,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Przepraszamy! Ale coś poszło nie tak z Twoim zapytaniem."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Zgłoś Błąd"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kod źródłowy"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Lista zmian"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Zaznacz wszystko"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Pokaż KodQR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "KodQR dla Twoich linii bridge"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ups, coś poszło nie tak!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Wygląda na to, że napotkaliśmy na błąd podczas próby pobrania Twojego kodu QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodów QR, aby skopiować je do Twojego telefonu lub innych urządzeń."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Aktualnie nie ma dostępnych żadnych mostów..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Prawdpododobnie powinieneś spróbować %s wrócić %s i wybrać inny typ mostu!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Pobierz %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Pobierz %s mostki %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s dodaj mosty do Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sP%so prostu daj mi mosty!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opcje zaawansowane"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nie"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "brak"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%sak!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sP%sozyskaj mosty"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[To jest wiadomość generowana automatycznie; prosimy na nią nie odpisywać.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Oto Twoje mostki:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Przekroczono limit szybkości. Proszę zwolnij! Minimalny czas pomiędzy \nwiadomości e-mail to %s godzin. Wszystkie dodatkowe e-maile w tym okresie będą ignorowane."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "POLECENIA: (łącz polecenia, aby sprecyzować kilka opcji jednocześnie)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Witamy w BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Obecnie obsługiwane transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Witaj, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Witaj przyjacielu!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Klucze Publiczne"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -99,7 +225,7 @@ msgstr "Ten email zastał wygenerowany przez tęcze, jednorożce i gwiazdki \ndl
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -110,7 +236,7 @@ msgid ""
msgstr "BridgeDB może dostarczać połączenia mostkowe z kilkoma %stypes włączanymi protokołami%s,\nktóre mogą pomóc ukryć Twoje połączenie do Sieci Tor, tworząc trudniejsze\ndo podsłuchania dla osób obserwujących ruch sieci w celu ustalenia gdzie się znajdujesz\nużywając Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -122,7 +248,7 @@ msgstr "Niektóre połączenia mostkowe z adresami IPv6 są również dostępne,
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -131,20 +257,20 @@ msgid ""
"\n"
msgstr "Dodatkowo, BridgeDB posiada sporo regularnych mostów %s bez \njakichkolwiek pluggable transports %s, które mogą wydawać się niezbyt przydatne, \njednak w wielu przypadkach mogą pomóc w obejściu cenzury.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Czym sÄ… mostki?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Mosty %s są węzłami w sieci Tor pomagającymi w ominięciu cenzury."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Potrzebuję alternatywnego sposobu na pozyskanie mostków!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -152,12 +278,12 @@ msgid ""
"%s, %s or %s."
msgstr "Innym sposobem na pozyskanie mostu jest wysłanie wiadomości e-mail na adres %s. Proszę pamiętać, że należy \nwysłać wiadomość używając adresu jednego z następujących dostawców poczty elektronicznej:\n%s, %s lub %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Moje mostki nie działają! Potrzebuję pomocy!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Jeśli Twój Tor nie działa, powinieneś wysłać wiadomość e-mail na adres %s."
@@ -165,48 +291,48 @@ msgstr "Jeśli Twój Tor nie działa, powinieneś wysłać wiadomość e-mail na
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Spróbuj zawrzeć jak najwiecej informacji o swoim problemie, uwzględniając listę mostów i Pluggable Transports, których próbowałeś użyć, wersję Tor Browser, wszelkie komunikaty, które zwrócił Tor i inne."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Oto Twoje połączenia z wykorzystaniem mostów:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Zdobądź Mosty!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Proszę wybrać opcje dla typu mostu:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Czy potrzebujesz adresów IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Czy potrzebujesz %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Twoja przeglądarka nie wyświetla obrazów prawidłowo."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Wprowadź tekst z obrazka powyżej..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Jak zacząć używać mostów"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -215,21 +341,21 @@ msgid ""
msgstr "Aby wprowadzić mosty do Tor Browser, postępuj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomić Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Po pojawieniu się okna 'Ustawienia Sieci Tor' naciśnij przycisk \"Konfiguruj\", a następnie postępuj zgodnie ze\nwskazówkami kreatora do momentu pytania o:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Czy Twój dostawca usług internetowych (ISP) blokuje lub cenzuruje połączenia do sieci Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -237,153 +363,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Wybierz 'Tak' a następnie kliknij 'Dalej'. Aby skonfigurować swoje nowe \nmosty, skopiuj i wklej każdy most w nowym wierszu w polu tekstowym. \nNa koniec kliknij 'Połącz' i to wszystko! Jeśli napotkasz jakiekolwiek problemy, naciśnij przycisk 'Pomoc' w kreatorze 'Ustawienia Sieci Tor' w celu uzyskania dalszych porad."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Wyświetla tę wiadomość."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "PoproÅ› o regularne mosty."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "PoproÅ› o mosty IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "PoproÅ› o Pluggable Transport przez TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Uzyskaj kopiÄ™ klucza publicznego GnuPG BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Zgłoś Błąd"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kod źródłowy"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Lista zmian"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Zaznacz wszystko"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Pokaż KodQR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "KodQR dla Twoich linii bridge"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ups, coś poszło nie tak!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Wygląda na to, że napotkaliśmy na błąd podczas próby pobrania Twojego kodu QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ten KodQR zawiera Twoje linie bridge. Przeskanuj je czytnikiem kodów QR, aby skopiować je do Twojego telefonu lub innych urządzeń."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Aktualnie nie ma dostępnych żadnych mostów..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Prawdpododobnie powinieneś spróbować %s wrócić %s i wybrać inny typ mostu!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Pobierz %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Pobierz %s mostki %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Teraz %s dodaj mosty do Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sP%so prostu daj mi mosty!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opcje zaawansowane"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nie"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "brak"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sT%sak!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sP%sozyskaj mosty"
diff --git a/pt/LC_MESSAGES/bridgedb.po b/pt/LC_MESSAGES/bridgedb.po
index ba60bd7..fa7d72d 100644
--- a/pt/LC_MESSAGES/bridgedb.po
+++ b/pt/LC_MESSAGES/bridgedb.po
@@ -3,7 +3,7 @@
# This file is distributed under the same license as the BridgeDB project.
#
# Translators:
-# Albert De Castro <albertdecastro at tutanota.com>, 2015
+# Alberto de Castro, 2015
# alfalb.as, 2015
# André Monteiro <andre.monteir at gmail.com>, 2014
# Bruno D. Rodrigues <bruno.rodrigues at litux.org>, 2015
@@ -21,7 +21,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-08 12:22+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Bruno D. Rodrigues <bruno.rodrigues at litux.org>\n"
"Language-Team: Portuguese (http://www.transifex.com/otf/torproject/language/pt/)\n"
"MIME-Version: 1.0\n"
diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 5b67aa3..9a9b9d4 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -19,7 +19,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-19 19:50+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Communia <ameaneantie at riseup.net>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
diff --git a/ro/LC_MESSAGES/bridgedb.po b/ro/LC_MESSAGES/bridgedb.po
index 6cafd55..45258f4 100644
--- a/ro/LC_MESSAGES/bridgedb.po
+++ b/ro/LC_MESSAGES/bridgedb.po
@@ -5,22 +5,23 @@
# Translators:
# Adda.17 <adrianatrifoi at gmail.com>, 2013
# Ana <ana_maria_js at yahoo.com>, 2015
-# axel_89 <axel_rap at yahoo.com>, 2015
+# axel_89, 2015
# Di N., 2015
-# Isus Satanescu <isus at openmailbox.org>, 2014
+# Isus Satanescu <inactive+isus at transifex.com>, 2014
# laura berindei <lauraagavriloae at yahoo.com>, 2014
# clopotel <yo_sergiu05 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'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-29 13:56+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Di N.\n"
-"Language-Team: Romanian (http://www.transifex.com/projects/p/torproject/language/ro/)\n"
+"Language-Team: Romanian (http://www.transifex.com/otf/torproject/language/ro/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
@@ -35,57 +36,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Scuze ! Ceva a n-a mers cum trebuie!"
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Raportează un bug"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Cod sursă"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Schimbări"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contact"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selectare totală"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Arată QRcod-ul"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Cod QR pentru liniile tale de punte"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Oops, ca să vezi!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Se pare că s-a produs o eroare în încercarea de a recupera codul QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Codul QR conține liniile tale de punte. Scanează-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Acum nu sunt punți disponibile..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Poate ar trebui să încerci %s înapoi %s și să alegeți un alt tip de punte!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Pas %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Descarcă %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Pas %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Ia %s punți %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Pas %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Acum %s adăugați punțile la Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%soar dă-mi punțile odată!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opțiuni avansate"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nu"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "niciunul/niciuna"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sD%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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sI%sa punți"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Acesta este un mesaj automat; te rugăm să nu răspunzi.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Acestea sunt punțile tale:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Ai depășit rata limită. Te rugăm să o iei mai încet! Timpul minim între\ne-mail-uri este %s ore. Toate e-mail-urile în acest interval vor fi ignorate."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (combină COMMANDs pentru a specifica mai multe opțiuni simultan)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Bine ai venit la BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "TYPEs transport suportate actual:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Bună , %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Bună, prietene!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Chei publice"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -96,7 +222,7 @@ msgstr "Acest e-mail a fost generat cu curcubee, inorogi și scântei \npentru %
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -107,7 +233,7 @@ msgid ""
msgstr "BridgeDB poate oferi punți cu câteva %stypes de Pluggable Transports%s,\nce pot \"umbri\" conexiunile tale către Tor Network, făcând mai dificil,\npentru cine îți urmărește traficul de Internet, să determine că de fapt\nfolosești Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -119,7 +245,7 @@ msgstr "Unele punți cu adrese IPv6 sunt disponibile, deși unele Pluggable\nTra
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -128,20 +254,20 @@ msgid ""
"\n"
msgstr "În plus, BridgeDB are multe punți simple %s fără nici o\nPluggable Transport %s ce poate nu pare așa cool, dar care pot\nde asemenea să ocolească cenzura internetului, în multe cazuri.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Ce sunt punțile? "
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s punți %s sunt releuri Tor care te ajută să ocolești cenzura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Am nevoie de o cale alternativă de a obține punțile !"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -149,12 +275,12 @@ msgid ""
"%s, %s or %s."
msgstr "O altă cale pentru a face punți este să trimiți un email către %s. Nu uita că\ntrebuie sa trimiți email-ul folosind o adresă de la unul dintre următorii furnizori de e-mail:\n%s, %s sau %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Punțile mele nu funcționează! Am nevoie de ajutor!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Daca Tor nu funcţionează, trimite un mesaj la %s ."
@@ -162,48 +288,48 @@ msgstr "Daca Tor nu funcţionează, trimite un mesaj la %s ."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Încercă să includezi cât mai multe informații despre cazul tău pe cât posibil, include lista de punți și Pluggable Transports pe care ai încercat să le foloseşti, versiunea de Tor Browser și orice alt mesaj dat de Tor, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Acestea sunt liniile de punți:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Ia punți!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Alege opțiunile pentru tipul de punte:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Ai nevoie de adrese IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Ai nevoie de %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Browserul nu afișează imaginile corect."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Introdu caracterele din imaginea de mai sus..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Cum să începi să foloseşti punțile"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -212,21 +338,21 @@ msgid ""
msgstr "Pentru a introduce punți în browser-ul Tor, mai întâi trebuie mers la %s descărcare browser Tor\npagină %s și apoi trebuie urmate instrucțiunile de descărcare și inițializare\na browser-ului Tor."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Când apare dialogul 'Setări rețea Tor', selectează 'Configurează' și urmează \nindicațiile programului până când îți cere:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Furnizorul de servicii de Internet (ISP) îți blochează sau cenzurează conexiunile către rețeaua Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -234,153 +360,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Selectează 'Da' și apoi alege 'Următorul'. Pentru a configura noile punți, copiază și colează liniile cu punțile în căsuța de text. În final, selectează 'Conectare' și totul e gata! Dacă ai probleme, click pe 'Help' din 'Setări Rețea Tor'."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Afișează acest mesaj."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Cere punți simple."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Cere punți IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Cere un Pluggable Transport după TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Obține o copie a cheii GnuPG publice a BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Raportează un bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Cod sursă"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Schimbări"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contact"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selectare totală"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Arată QRcod-ul"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Cod QR pentru liniile tale de punte"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Oops, ca să vezi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Se pare că s-a produs o eroare în încercarea de a recupera codul QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Codul QR conține liniile tale de punte. Scanează-l cu un cititor de coduri QR pentru a copia liniile tale de punte pe mobil sau alt device."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Acum nu sunt punți disponibile..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Poate ar trebui să încerci %s înapoi %s și să alegeți un alt tip de punte!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Pas %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Descarcă %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Pas %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Ia %s punți %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Pas %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Acum %s adăugați punțile la Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sD%soar dă-mi punțile odată!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opțiuni avansate"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nu"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "niciunul/niciuna"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sD%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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sI%sa punți"
diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index 50f7c7a..e160fda 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/LC_MESSAGES/bridgedb.po
@@ -21,7 +21,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-02-11 09:56+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Antony A. Tolmachev <a.tolmachev at richart-consalt.ru>\n"
"Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
"MIME-Version: 1.0\n"
diff --git a/ru at petr1708/LC_MESSAGES/bridgedb.po b/ru at petr1708/LC_MESSAGES/bridgedb.po
index ff15e6e..0bb4ffd 100644
--- a/ru at petr1708/LC_MESSAGES/bridgedb.po
+++ b/ru at petr1708/LC_MESSAGES/bridgedb.po
@@ -7,16 +7,17 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Russian Petrine orthography (http://www.transifex.com/otf/torproject/language/ru@petr1708/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ru at petr1708\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"Plural-Forms: nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);\n"
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ðѣтъ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ðѣтъ"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/si_LK/LC_MESSAGES/bridgedb.po b/si_LK/LC_MESSAGES/bridgedb.po
index 47c6aaf..ca7f96b 100644
--- a/si_LK/LC_MESSAGES/bridgedb.po
+++ b/si_LK/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Sinhala (Sri Lanka) (http://www.transifex.com/otf/torproject/language/si_LK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: si_LK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "සියල්ල à¶à·à¶»à¶±à·Šà¶±"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ලබà·à¶œà¶±à·Šà¶±%s සේà¶à·”න් %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "නà·à¶"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "සේà¶à·” යනු මොනවà·à¶¯?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "සේà¶à·” ලබà·à¶œà·à¶±à·“මට විකල්ප විධියක් මට අවà·à·Šâ€à¶ºà¶º!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "මà·à¶œà·š සේà¶à·” à·€à·à¶© නොකරයි! මට උදවු අවà·à·Šâ€à¶ºà¶ºà·’!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "සියල්ල à¶à·à¶»à¶±à·Šà¶±"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ලබà·à¶œà¶±à·Šà¶±%s සේà¶à·”න් %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "නà·à¶"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/sk/LC_MESSAGES/bridgedb.po b/sk/LC_MESSAGES/bridgedb.po
index 134bd99..f04e59a 100644
--- a/sk/LC_MESSAGES/bridgedb.po
+++ b/sk/LC_MESSAGES/bridgedb.po
@@ -11,14 +11,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-08-04 20:57+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: FooBar <thewired at riseup.net>\n"
"Language-Team: Slovak (http://www.transifex.com/otf/torproject/language/sk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: sk\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
@@ -33,57 +34,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "PrepáÄte! NieÄo je zle s vaÅ¡ou požiadavkou."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Nahlásiť chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Zdrojový kód"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Posledné zmeny"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "OznaÄiÅ¥ vÅ¡etko"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Zobraziť QR Kód"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kód vaÅ¡ich premostenÃ"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Do pekla!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Zdá sa že nastala chyba pri zÃskavanà vášho QR kódu."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Tento QR kód obsahuje vaÅ¡e prehostenia. Možete ho zoskenovaÅ¥ ÄÃtaÄkou QR kódov, ktorou ich skopÃrujete do mobilu Äi iných zariadenÃ"
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Práve niesú dostupné žiadne premostenia..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Možno by ste mohli skúsiÅ¥ %s ÃsÅ¥ späť %s a vybraÅ¥ si iný typ premostenia."
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Stiahnuť %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ZÃskajte %s premostenia %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sL%sen mi zobrazte premostenia!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "PokroÄilé možnosti"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nie"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "žiadne"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÃ%sno!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sN%sastaviť Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Toto je automatická správa; prosÃm, neodpovedajte.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Tu sú vaše premostenia:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "PrekroÄili ste rate limit. ProsÃm spomaľte. Minimálny Äas medzi emailmi je %s hodÃn. VÅ¡etky dalÅ¡ie emaily poÄas tejto doby budú ignorované."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "PRÃKAZY: (kombinujte prÃkazy na zadanie viac možnostà naraz)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Vitajte v BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Práve podporované transport typy:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hej, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Ahoj, priateľ!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Verejné kľúÄe"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -94,7 +220,7 @@ msgstr "Tento email bol generovaný s dúhami, jednorožcami a trblietkami pre %
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,7 +231,7 @@ msgid ""
msgstr "BridgeDB vám dokáže ponúknuÅ¥ niekolko typov %spremostenà s Pluggable Transports%s,\nktoré vám pomôžu maskovaÅ¥ vaÅ¡e pripojenie na Tor Network, ktoré ztažà každému kto sleduje vaÅ¡e internetové pripojenie zistiÅ¥ to že použÃvate Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -117,7 +243,7 @@ msgstr "Niektoré premostenia s IPv6 adresami sú taktiež dostupné, ale niekto
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -126,20 +252,20 @@ msgid ""
"\n"
msgstr "DodatoÄne, BridgeDB má dosÅ¥ pôvodnych premostenà %s bez žiadnych Pluggable Transports %s ktoré možno niesu až také cool, ale vo veľa prÃpadoch stále dokážu obÃsÅ¥ cenzúrovanie internetu.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Čo sú to premostenia?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s premostenia %s sú Tor relaye ktoré vám pomáhaju obÃsÅ¥ cenzúru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Potrebujem iný spôsob ako zÃskaÅ¥ premostenia!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -147,12 +273,12 @@ msgid ""
"%s, %s or %s."
msgstr "DalÅ¡Ãm spôsobom ako zÃskaÅ¥ premostenia je poslaÅ¥ mail na %s. \nEmail vÅ¡ak musÃte poslaÅ¥ pomocou adresy od jedného z týchto poskytovateľov:\n%s, %s alebo %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Moje premostenia nefungujú! Potrebujem pomoc!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Ak váš Tor nefunguje, skúste napÃsaÅ¥ email %s."
@@ -160,48 +286,48 @@ msgstr "Ak váš Tor nefunguje, skúste napÃsaÅ¥ email %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Skúste napÃsaÅ¥ Äo najviac informacià o vaÅ¡om prÃpade, vrátane zoznamu premostenà a Pluggable Transportov ktoré ste skúšali použiÅ¥, verzia Tor Browseru, a hlášky ktoré Tor vypÃsal, apod."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Tu sú vaše premostenia:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "ZÃskaÅ¥ premostenia!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "ProsÃm vyberte si možnosti na typ premostenia:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 adresy?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Váš prehliadaÄ nezobrazuje obrázky správne."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Vložte znaky z obrázku vyššie..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Ako zaÄaÅ¥ použÃvaÅ¥ vaÅ¡e premostenia"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -210,21 +336,21 @@ msgid ""
msgstr "Na zadanie premostenà do Tor Browsera, najprv choÄte na download stránku %s %s Tor Browsera a riaÄte sa inÅ¡trukiacmi na stiahnutie a zapnutie Tor Browsera."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "KeÄ vyskoÄia 'Tor SieÅ¥ové Nastavenia', kliknite na 'KonfigurovaÅ¥' a pokraÄujte Äalej kým sa váš insÅ¥alátor nespýta:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokuje alebo nejak cenzuruje váš Poskytovateľ Internetu (ISP) pripojenia k Sieti Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -232,153 +358,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "OznaÄte 'Ãno' a potom kliknite na 'ÄŽalej'. Na konfiguráciu nových premostenÃ, skopÃrujte premostenia do polÃÄka na text. Potom kliknite na 'PripojiÅ¥' a už by to malo fungovaÅ¥. Ak máte nejaké problemy, kliknite na tlaÄidlo 'Pomoc' v 'Tor sieÅ¥ových nastaveniach' pre viac informaciÃ. "
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Zobrazà túto správu."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Požiadať o pôvodné premostenia."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Požiadať o IPv6 premostenia."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Požiadať o Pluggable Transport podla typu."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Stiahnite si kópiu verejného klúÄa GNUPG pre BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Nahlásiť chybu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Zdrojový kód"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Posledné zmeny"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "OznaÄiÅ¥ vÅ¡etko"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Zobraziť QR Kód"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR kód vaÅ¡ich premostenÃ"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Do pekla!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Zdá sa že nastala chyba pri zÃskavanà vášho QR kódu."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Tento QR kód obsahuje vaÅ¡e prehostenia. Možete ho zoskenovaÅ¥ ÄÃtaÄkou QR kódov, ktorou ich skopÃrujete do mobilu Äi iných zariadenÃ"
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Práve niesú dostupné žiadne premostenia..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Možno by ste mohli skúsiÅ¥ %s ÃsÅ¥ späť %s a vybraÅ¥ si iný typ premostenia."
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Stiahnuť %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ZÃskajte %s premostenia %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sL%sen mi zobrazte premostenia!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "PokroÄilé možnosti"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nie"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "žiadne"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÃ%sno!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sN%sastaviť Bridges"
diff --git a/sk_SK/LC_MESSAGES/bridgedb.po b/sk_SK/LC_MESSAGES/bridgedb.po
index a618998..a70ac9b 100644
--- a/sk_SK/LC_MESSAGES/bridgedb.po
+++ b/sk_SK/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+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"
+"Language-Team: Slovak (Slovakia) (http://www.transifex.com/otf/torproject/language/sk_SK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: sk_SK\n"
"Plural-Forms: nplurals=3; plural=(n==1) ? 0 : (n>=2 && n<=4) ? 1 : 2;\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "PrepáÄte! Pri spracovanà vaÅ¡ej požiadavky sa vyskytla chyba."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Nahlásiť chybu"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Zdrojový kód"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Záznam zmien"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ejha!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Žiadne premostenia nie sú práve dostupné..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Mohli by ste skúsiť %s vrátiť sa naspäť %s a zvoliť iný typ premostenia!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Krok %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Prevziať %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Krok %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ZÃskaÅ¥ %s premostenia %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Krok %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Teraz %s pridajte premostenia do Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sD%saj mi premostenia!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "RozÅ¡Ãrené nastavenia"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Nie"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "žiadne"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sÃ%sno!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sZ%sÃskaÅ¥ Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Toto je automatická správa; prosÃm, neodpovedajte.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Tu sú vaše premostenia:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "PrekroÄili ste limit. Spomaľte, prosÃm! Minimálny odstup medzi e-mailami je\n%s hodÃn. Každý ÄalÅ¡Ã e-mail nereÅ¡pektujúci tento Äasový odstup bude ignorovaný."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "PRÃKAZY: (pre urÄenie viacerých možnostà súÄasne PRÃKAZY kombinujte)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Vitajte v BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Aktuálne podporované TYPE transportov:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Ahoj, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Ahoj!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Verejné kľúÄe"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr "Tento e-mail bol vytvorený pre %s %s o %s."
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr "BridgeDB poskytuje premostenia s rôznymi %stypmi Pluggable Transportov%s,\nktoré vám pomôžu zakryÅ¥ vaÅ¡e pripojenie do Tor Network. Pre každého,\nkto sleduje vaÅ¡e internetové pripojenie, bude potom rozpoznanie toho, že použÃvate Tor, zložitejÅ¡ie.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr "Je dostupných aj niekoľko premostenàs adresami IPv6, niektoré Plugg
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr "Naviac, BridgeDB obsahuje dostatok starých dobrých, na kosÅ¥ osekaných premostenÃ\n%s bez Pluggable Transportov %s, použitie ktorých možno neznie tak skvele a cool,\nale stále vám v mnohých prÃpadoch pomôžu obÃsÅ¥ cenzúru internetu.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Čo sú premostenia?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Premostenia %s sú Tor relé, ktoré vám pomáhajú obÃsÅ¥ cenzúru."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Potrebujem alternatÃvny spôsob zÃskania premostenÃ!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr "ÄŽalÅ¡Ãm zo spôsobov, ako zÃskaÅ¥ premostania, je poslaÅ¥ e-mail na %s. Berte, prosÃm,\nna vedomie, že e-mail musÃte poslaÅ¥ z adresy od jedného z nasledujúcich\nposkytovateľov e-mailu:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Moje premostenia nefungujú! Potrebujem pomoc!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Ak vám nefunguje Tor, mali by ste napÃsaÅ¥ e-mail na %s."
@@ -156,48 +282,48 @@ msgstr "Ak vám nefunguje Tor, mali by ste napÃsaÅ¥ e-mail na %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Pokúste sa priložiÅ¥ Äo najviac informácià o vaÅ¡om probléme, vrátane zoznamu premostenà a Pluggable Transportov, ktoré ste skúšali použiÅ¥, verziu vášho Tor Browser, vÅ¡etky ÄalÅ¡ie správy, ktoré Tor vypÃsal atÄ."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Tu sú vaše riadky premostenia:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "ZÃskaÅ¥ Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Zvoľte, prosÃm, možnosti pre typ premostenia:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete adresy IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Váš prehliadaÄ nezobrazuje obrázky správne."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Zadajte znaky z obrázka vyššie..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Ako zaÄaÅ¥ použÃvaÅ¥ premostenia"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "KeÄ sa objavà dialógové okno 'Nastavenia Tor Network', kliknite na 'KonfigurovaÅ¥'\na riaÄte sa sprievodcom, kým sa nespýta:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Blokuje váš poskytovateľ internetového pripojenia (ISP) alebo inak cenzuruje pripojenia do siete Tor Network?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Zvoľte 'Ãno' a potom kliknite na 'ÄŽalej'. Pre nastavenie vaÅ¡ich nových\npremostenÃ, skopÃrujte a vložte riadky premostenà do vstupného textového\npoľa. Nakoniec kliknite na 'PripojiÅ¥' a môžete pracovaÅ¥. Ak sa vyskytnú\nproblémy, pre ÄalÅ¡iu pomoc skúste kliknúť na tlaÄidlo 'PomocnÃk' v sprievodcovi\n'Nastavenia Tor Network'."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Zobrazà túto správu."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Vyžiadať si osekané premostenia."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Vyžiadať si IPv6 premostenia."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Vyžiadať Pluggable Transport podľa TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "ZÃskaÅ¥ kópiu verejného GnuPG kľúÄa BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Nahlásiť chybu"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Zdrojový kód"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Záznam zmien"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ejha!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Žiadne premostenia nie sú práve dostupné..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Mohli by ste skúsiť %s vrátiť sa naspäť %s a zvoliť iný typ premostenia!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Krok %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Prevziať %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Krok %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "ZÃskaÅ¥ %s premostenia %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Krok %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Teraz %s pridajte premostenia do Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sD%saj mi premostenia!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "RozÅ¡Ãrené nastavenia"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Nie"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "žiadne"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sÃ%sno!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sZ%sÃskaÅ¥ Bridges"
diff --git a/sl/LC_MESSAGES/bridgedb.po b/sl/LC_MESSAGES/bridgedb.po
index 7ffc7d2..72768c3 100644
--- a/sl/LC_MESSAGES/bridgedb.po
+++ b/sl/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Slovenian (http://www.transifex.com/projects/p/torproject/language/sl/)\n"
+"Language-Team: Slovenian (http://www.transifex.com/otf/torproject/language/sl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: sl\n"
"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n%100==4 ? 2 : 3);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Stik"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr ""
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr ""
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr ""
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -156,48 +282,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Stik"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ne"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/sl_SI/LC_MESSAGES/bridgedb.po b/sl_SI/LC_MESSAGES/bridgedb.po
index 1b5c865..1a7f051 100644
--- a/sl_SI/LC_MESSAGES/bridgedb.po
+++ b/sl_SI/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-26 16:31+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Tomi Bizjak <bizjaktomaz72 at gmail.com>\n"
"Language-Team: Slovenian (Slovenia) (http://www.transifex.com/otf/torproject/language/sl_SI/)\n"
"MIME-Version: 1.0\n"
diff --git a/sq/LC_MESSAGES/bridgedb.po b/sq/LC_MESSAGES/bridgedb.po
index 8016ab3..dda9971 100644
--- a/sq/LC_MESSAGES/bridgedb.po
+++ b/sq/LC_MESSAGES/bridgedb.po
@@ -7,14 +7,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-23 22:30+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Bujar Tafili\n"
-"Language-Team: Albanian (http://www.transifex.com/projects/p/torproject/language/sq/)\n"
+"Language-Team: Albanian (http://www.transifex.com/otf/torproject/language/sq/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -29,57 +30,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Kërkojmë ndjesë! Diçka shkoi keq me kërkesën tuaj."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Raportoni një gabim"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kodi Burimor"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Regjistri i ndryshimeve"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Kontakt"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Përzgjidhini të Gjitha"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Tregoni Kodin QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Kodi QR përlinjat e urave tuaja"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Çfarë tersi!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Duket se u has një gabim, duke marrë Kodin tuaj QR."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ky Kod QR përmban linja urash. Skanojeni me një lexues Kodi QR, që t'i kopjoni linjat e urave tuaja në celular, apo në pajisje të tjera."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Këtë çast s'ka asnjë urë të disponueshme..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " Ndoshta duhet të provoni të %s shkoni prapa %s dhe të zgjidhni një lloj të ndryshëm ure!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Hapi %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Shkarkoni %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Hapi %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Merrni %s ura %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Hapi %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Tani %s shtojini urat tek Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sM%së jepni urat!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opsionet e Përparuara"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Jo"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "asnjë"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sP%so!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sM%serrni Urat"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Ky është një mesazh automatik; ju lutemi mos u përgjigjni.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Këtu janë urat tuaja:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Ju e keni kapërcyer kufirin. Ju lutemi, më ngadalë! Koha minimum midis \ne-postave është %s orë. Të gjitha e-postat e tjera gjatë kësaj periudhe kohe do të injorohen."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "COMMANDs: (kombinojini COMMANDs për të specifikuar zgjedhje të shumëfishta njëkohësisht)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Mirë se erdhët tek BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "Transport TYPEs të mbështetura këtë çast: "
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hej, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Përshëndetje mik!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Kyça Publikë"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -90,7 +216,7 @@ msgstr "Kjo e-postë është gjeneruar me ylberë, njëbrirësha dhe shkëndija\
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -101,7 +227,7 @@ msgid ""
msgstr "BridgeDB mund të ofrojë ura me shumë %slloje të Pluggable Transports%s,\nqë mund të ndihmojë fshehjen e lidhjeve tuaja për Tor Network, duke e bërë atë më \ntë vështirë për këdo që vëzhgon trafikun tuaj të internetit, për të përcaktuar nëse ju jeni\nduke përdorur Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -113,7 +239,7 @@ msgstr "Disa ura me adresa IPv6 janë po ashtu të mundshme, ndonëse disa Plugg
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -122,20 +248,20 @@ msgid ""
"\n"
msgstr "Përveç kësaj, BridgeDB ka shumë ura %s të bezdisshme, pa ndonjë\nPluggable Transports %s, çka ndoshta nuk do të tingëllojë mirë, por ata ende\nmund të ndihmojnë që ta anashkaloni censurën e internetit në shumë raste.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Ç'janë urat?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Urat %s janë rele Tor, që ju ndihmojnë të anashkaloni censurën."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Më nevojitet një mënyrë alternative për përftimin e urave!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -143,12 +269,12 @@ msgid ""
"%s, %s or %s."
msgstr "NJë mënyrë tjetër për të përftuar ura është të dërgoni një e-postë tek %s. ju lutemi vini re se ju duhet\nta dërgoni e-postën, duke përdorur një adresë nga njëri prej ofruesve të e-postës në vijim:\n%s, %s ose %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Urat e mia nuk punojnë! Më duhet ndihmë!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Nëse Tor i juaj nuk punon, ju duhet t'i dërgoni e-postë %s."
@@ -156,48 +282,48 @@ msgstr "Nëse Tor i juaj nuk punon, ju duhet t'i dërgoni e-postë %s."
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Përpiquni të përfshini sa më shumë informacion që të mundeni rreth rastit tuaj, duke vendosur edhe listën e\nurave dhe Pluggable Transports që provuat të përdorni, versionin tuaj të Tor Browser,\nsi dhe çdo mesazh që ka dhënë Tor, etj."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Këtu janë linjat e urave tuaja:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Merrni Ura!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Ju lutemi përzgjidhni mundësitë për llojin e urës:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "A ju nevojiten adresat IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "A ju nevojitet një %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Futini karakteret nga imazhi më sipër..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Si të nisni t'i përdorni urat tuaja"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -206,21 +332,21 @@ msgid ""
msgstr "Për t'i futur urat në Tor Browser, së pari shkoni tek %s faqja e shkarkimit \ntë Tor Browser %s dhe më pas ndiqini instruksionet aty, që ta shkarkoni dhe nisni \nTor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Kur dialogu i \"Konfigurimit të Rrjetit Tor\" të kërcejë, klikoni \"Konfiguroni\" dhe ndiqni\nasistentin derisa ta kërkojë ai:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "A i pengon apo i censuron Ofruesi juaj i Shërbimt Internet (ISP) lidhjet\ntek rrjeti Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -228,153 +354,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Përzgjidhni \"Po\" dhe më pas klikoni \"Tjetri\". Që të konfiguroni urat tuaja të reja, kopjojini dhe\nngjitini linjat e urave në kutinë e futjes së tekstit. Më në fund, klikoni \"Lidhuni\", dhe\ndo të jeni gati për t'ia nisur! Nëse do të përjetoni probleme, përpiquni të klikoni butonin \"Ndihmë\" \ntek asistenti i \"Konfigurimit të Rrjetit Tor\", për më shumë mbështetje."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Shfaq këtë mesazh."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Kërkoni urat vanilje ose non-Pluggable Transport."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Kërkoni urat IPv6."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Kërkoni një Pluggable Transport nëpërmjet TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Merrni një kopje të kyçit publik GnuPG të BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Raportoni një gabim"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kodi Burimor"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Regjistri i ndryshimeve"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Kontakt"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Përzgjidhini të Gjitha"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Tregoni Kodin QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Kodi QR përlinjat e urave tuaja"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Çfarë tersi!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Duket se u has një gabim, duke marrë Kodin tuaj QR."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Ky Kod QR përmban linja urash. Skanojeni me një lexues Kodi QR, që t'i kopjoni linjat e urave tuaja në celular, apo në pajisje të tjera."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Këtë çast s'ka asnjë urë të disponueshme..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " Ndoshta duhet të provoni të %s shkoni prapa %s dhe të zgjidhni një lloj të ndryshëm ure!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Hapi %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Shkarkoni %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Hapi %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Merrni %s ura %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Hapi %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Tani %s shtojini urat tek Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sM%së jepni urat!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opsionet e Përparuara"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Jo"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "asnjë"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sP%so!"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sM%serrni Urat"
diff --git a/sr/LC_MESSAGES/bridgedb.po b/sr/LC_MESSAGES/bridgedb.po
index aab19aa..2045d9c 100644
--- a/sr/LC_MESSAGES/bridgedb.po
+++ b/sr/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-13 16:39+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Lidija <llazic.bgd at gmail.com>\n"
"Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
"MIME-Version: 1.0\n"
diff --git a/sr at latin/LC_MESSAGES/bridgedb.po b/sr at latin/LC_MESSAGES/bridgedb.po
index ae69a54..761dca9 100644
--- a/sr at latin/LC_MESSAGES/bridgedb.po
+++ b/sr at latin/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-30 13:41+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Dejan Andric <el.dejan.andric at gmail.com>\n"
"Language-Team: Serbian (Latin) (http://www.transifex.com/otf/torproject/language/sr@latin/)\n"
"MIME-Version: 1.0\n"
diff --git a/sv/LC_MESSAGES/bridgedb.po b/sv/LC_MESSAGES/bridgedb.po
index 4671c38..9fb91cb 100644
--- a/sv/LC_MESSAGES/bridgedb.po
+++ b/sv/LC_MESSAGES/bridgedb.po
@@ -5,7 +5,7 @@
# Translators:
# Anders Jensen-Urstad <anders at unix.se>, 2014
# Emil Johansson <emil.a.johansson at gmail.com>, 2015
-# GabSeb, 2014
+# Gabor Sebastiani, 2014
# Peter Michanek <peter at michanek.se>, 2015
# Petomatick <petomatick at hotmail.com>, 2011
# ph AA, 2015
@@ -17,7 +17,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-26 04:38+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Emil Johansson <emil.a.johansson at gmail.com>\n"
"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
"MIME-Version: 1.0\n"
diff --git a/ta/LC_MESSAGES/bridgedb.po b/ta/LC_MESSAGES/bridgedb.po
index b504431..9be351c 100644
--- a/ta/LC_MESSAGES/bridgedb.po
+++ b/ta/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-06-15 10:58+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: anto sujesh <sujeshantoj at gmail.com>\n"
-"Language-Team: Tamil (http://www.transifex.com/projects/p/torproject/language/ta/)\n"
+"Language-Team: Tamil (http://www.transifex.com/otf/torproject/language/ta/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ta\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "மனà¯à®©à®¿à®•à¯à®•à®µà¯à®®à¯! உஙà¯à®•à®³à¯ வேணà¯à®Ÿà¯à®•à¯‹à®³à®¿à®±à¯à®•à¯ à®à®¤à¯‹à®’ர௠தவற௠நேரà¯à®¨à¯à®¤à¯à®³à¯à®³à®¤à¯."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "ஒர௠பிழையை அறிகà¯à®•à¯ˆà®šà¯†à®¯à¯à®•"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "மூல தொகà¯à®ªà¯à®ªà¯"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "மாறà¯à®±à®®à¯à®•à¯à®±à®¿à®•à¯à®•à¯à®®à¯ கோபà¯à®ªà¯"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "தொடரà¯à®ªà¯ கொளà¯"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "எலà¯à®²à®¾à®µà®±à¯à®±à¯ˆà®¯à¯à®®à¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr " ஹோ, பிரசà¯à®šà®©à¯ˆ!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "தறà¯à®šà®®à®¯à®®à¯ Bridge-கள௠யேதà¯à®®à¯ இலà¯à®²à¯ˆ..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à®’à®°à¯à®µà¯‡à®³à¯ˆ நீஙà¯à®•à®³à¯ %s à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®• பினà¯à®©à¯‡ செனà¯à®±à¯ %s வேறொர௠வகை தேரà¯à®µà¯ செயà¯à®¯à®²à®¾à®®à¯!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "அடி %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "பதிவிறகà¯à®•à®µà¯à®®à¯ %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "அடி %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s Bridge-களை %s பெறà¯à®•"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "அடி %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "இபà¯à®ªà¯Šà®´à¯à®¤à¯ %s bridge-களை Tor Browser-உள௠%s சேரà¯à®•à¯à®•à®µà¯à®®à¯"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sநே%sரயடியாக bridge-களை கொடà¯à®•à¯à®•à®µà¯à®®à¯!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "இலà¯à®²à¯ˆ"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "எதà¯à®µà¯à®®à®¿à®²à¯à®²à¯ˆ"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sபெ%sà®°à¯à®• Bridge-களை"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[ இத௠ஒர௠தானியஙà¯à®•à®¿ செயà¯à®¤à®¿; தயவ௠செயà¯à®¤à¯ பதில௠அனà¯à®ªà¯à®ª வேணà¯à®Ÿà®¾à®®à¯.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "இதோ உஙà¯à®•à®³à¯ bridges:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "நீஙà¯à®•à®³à¯ வீத வரமà¯à®ªà¯ மீறி விடà¯à®Ÿà¯€à®°à¯à®•à®³à¯. தயவ௠செயà¯à®¤à¯ மெதà¯à®µà®Ÿà¯ˆà®¯à®µà¯à®®à¯! மினà¯à®©à®žà¯à®šà®²à¯à®•à®³à®¿à®©à¯ இடையே கà¯à®±à¯ˆà®¨à¯à®¤à®ªà®Ÿà¯à®š நேரம௠%s மணிகளà¯. இநà¯à®¤ நேரதà¯à®¤à®¿à®©à¯à®³à¯ அனைதà¯à®¤à¯ மினà¯à®©à®žà¯à®šà®²à¯à®•à®³à¯à®®à¯ நிராகரிகà¯à®•à®ªà¯à®ªà®Ÿà¯à®®à¯."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "கடà¯à®Ÿà®³à¯ˆà®•à®³à¯: (பல விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ˆ கà¯à®±à®¿à®ªà¯à®ªà®¿à®Ÿ கடà¯à®Ÿà®³à¯ˆà®•à®³à¯ˆ ஒரேசமயதà¯à®¤à®¿à®²à¯ ஒனà¯à®±à®¿à®¯à®¿à®©à¯ˆà®•à®µà¯à®®à¯)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB-யினà¯à®³à¯ நலà¯à®µà®°à®µà¯"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "தறà¯à®ªà¯‡à®¾à®¤à¯ ஆதரவ௠உளà¯à®³ Transport TYPE-கள௠"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "ஹே, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "ஹலோ, தோழா!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "இநà¯à®¤ மினà¯à®©à®žà¯à®šà®²à¯ வானவிலà¯, ய
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr "BridgeDB-யால௠%sபலவகையான Pluggable Transports%s bridge-களை தரமà¯à®Ÿà®¿à®¯à¯à®®à¯,\nஇவை உஙà¯à®•à®³à¯ Tor Network இணைபà¯à®ªà¯à®•à®³à¯ˆ விளஙà¯à®•à®¾à®¤à®µà®£à¯à®£à®®à¯ ஆகà¯à®•à®µà¯à®¤à®µà®¿, உஙà¯à®•à®³à®¿à®©à¯ \nஇணைய போகà¯à®•à¯à®µà®°à®¤à¯à®¤à¯ˆ கணà¯à®•à®¾à®©à®¿à®ªà¯à®ªà®µà®°à¯à®•à¯à®•à¯ நீஙà¯à®•à®³à¯ Tor பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤à¯à®•à®¿à®±à¯€à®°à¯à®•à®³à¯ எனகà¯à®•à®©à¯à®Ÿà®±à®¿à®¯ மேலà¯à®®à¯\nகடினம௠ஆகà¯à®•à¯à®®à¯.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "சில IPv6 à®®à¯à®•à®µà®°à®¿à®•à¯à®•à¯Šà®£à¯à®Ÿ bridge-களà¯
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr "கூடà¯à®¤à®²à®¾à®•, BridgeDB-யினà¯à®³à¯ à®à®°à®¾à®³à®®à®¾à®© பழையமà¯à®±à¯ˆ bridge-கள௠\n%s Pluggable Transports வசதியிலà¯à®²à®¾à®®à®²à¯ உளà¯à®³à®¤à¯ %s உணரà¯à®šà¯à®šà®¿ ஊடà¯à®Ÿà¯à®•à®¿à®±à®µà®¾à®±à¯ இலà¯à®²à®¾à®µà®¿à®Ÿà¯à®Ÿà®¾à®²à¯à®®à¯, \nஇவையால௠பல சநà¯à®¤à®°à¯à®ªà¯à®ªà®™à¯à®•à®³à®¿à®²à¯ இனைய தணிகà¯à®•à¯ˆà®¯à¯ˆ கடகà¯à®• உதவà¯à®®à¯.\n\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Bridges எனà¯à®±à®¾à®²à¯ எனà¯à®©?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridge-கள௠%s எனà¯à®®à¯ Tor Relay-கள௠தணிகà¯à®•à¯ˆà®¯à¯ˆ கடகà¯à®• உதவà¯à®®à¯"
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "எனகà¯à®•à¯ Bridge-களை பெறà¯à®µà®¤à®±à¯à®•à¯ ஓர௠மாறà¯à®±à¯ வழி வேணà¯à®Ÿà¯à®®à¯"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr "Bridge-களை பெறà¯à®µà®¤à®±à¯à®•à¯ ஓர௠மாறà¯à®±à¯à®µà®´à®¿ %s à®®à¯à®•à®µà®°à®¿à®•à¯à®•à¯ ஒர௠மினà¯à®©à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ªà®²à®¾à®®à¯.\nதயவ௠செயà¯à®¯à®¤à¯ கவனிகà¯à®•à®µà¯à®®à¯, நீஙà¯à®•à®³à¯ கடà¯à®Ÿà®¾à®¯à®®à®¾à®• கீழà¯à®•à®£à¯à®Ÿ மினà¯à®©à®žà¯à®šà®²à¯ சேவைகளின௠மà¯à®•à®µà®°à®¿à®¯à®¿à®²à®¿à®°à¯à®¨à¯à®¤à¯ மடà¯à®Ÿà¯à®®à¯‡ மினà¯à®©à®žà¯à®šà®²à¯ அனà¯à®ªà¯à®ªà®²à®¾à®®à¯ :\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "என௠Bridge-கள௠வேலை செயà¯à®¯à®µà®¿à®²à¯à®²à¯ˆ! எனகà¯à®•à¯ உதவி தேவை!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "உஙà¯à®•à®³à¯ Tor வேலை செயà¯à®¯à®µà®¿à®²à¯à®²à¯ˆ எனிலà¯, நீஙà¯à®•à®³à¯ %s தொடரà¯à®ªà¯à®•à¯Šà®³à¯à®• "
@@ -157,48 +283,48 @@ msgstr "உஙà¯à®•à®³à¯ Tor வேலை செயà¯à®¯à®µà®¿à®²à¯à®²à¯ˆ
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "உஙà¯à®•à®³à¯ வழகà¯à®•à¯ கà¯à®±à®¿à®¤à¯à®¤à¯ அதிகபடà¯à®š தகவலà¯à®•à®³à¯ˆ சேரà¯à®™à¯à®•à®³à¯, இதில௠நீஙà¯à®•à®³à¯ பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ à®®à¯à®¯à®±à¯à®šà®¿à®¤à¯à®¤ bridges\nமறà¯à®±à¯à®®à¯ Pluggable Transports, தஙà¯à®•à®³à®¿à®©à¯ Tor Browser பதிபà¯à®ªà¯ எண௠ஆகியவை அடஙà¯à®•à¯à®®à¯, மறà¯à®±à¯à®®à¯ Tor\nகூரியதகவலà¯à®•à®³à¯ போனà¯à®±à®µà®±à¯à®±à¯ˆà®¯à¯à®®à¯ சேரà¯à®•à¯à®•à®µà¯à®®à¯."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "இதோ உஙà¯à®•à®³à¯ bridge வரிசைகளà¯: "
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Bridge-களை பெறà¯à®•!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Bridge வகை விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯ˆ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®•à¯à®•à®µà¯à®®à¯:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "உஙà¯à®•à®³à¯à®•à¯à®•à¯ IPv6 à®®à¯à®•à®µà®°à®¿à®•à®³à¯ வேணà¯à®Ÿà¯à®®à®¾?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "உஙà¯à®•à®³à¯à®•à¯à®•à¯ ஒர௠%s தேவையா?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr " தஙà¯à®•à®³à®¿à®©à¯ browser படஙà¯à®•à®³à¯ˆ சரியாக காடà¯à®Ÿà®µà®¿à®²à¯à®²à¯ˆ."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "மேலே உளà¯à®³ படதà¯à®¤à®¿à®²à¯ இரà¯à®•à¯à®•à¯à®®à¯ எழà¯à®¤à¯à®¤à¯à®•à¯à®•à®³à¯ உளà¯à®³à®¿à®Ÿà®µà¯à®®à¯..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "தஙà¯à®•à®³à®¿à®©à¯ bridge-களை பயனà¯à®ªà®Ÿà¯à®¤à¯à®¤ தொடஙà¯à®•à¯à®µà®¤à¯ எபà¯à®ªà®Ÿà®¿"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "'Tor நெடà¯à®µà¯†à®¾à®°à¯à®•à¯ அமைபà¯à®ªà¯à®•à®³à¯' உரையாடல௠மேலà¯à®¤à¯‡à®¾à®©à¯à®±à¯à®®à¯ பொழà¯à®¤à¯, 'கடà¯à®Ÿà®®à¯ˆà®•à¯à®•' கிளிகà¯à®šà¯†à®¯à¯à®¤à¯ \nவழிகாடà¯à®Ÿà®¿à®¯à¯ˆ அத௠கேடà¯à®•à¯à®®à¯à®µà®°à¯ˆ பினà¯à®ªà®±à¯à®±à®µà¯à®®à¯:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "உஙà¯à®•à®³à®¿à®©à¯ இணைய சேவை வழஙà¯à®•à¯à®®à¯ (ISP) நிறà¯à®µà®©à®®à¯ Tor நெடà¯à®µà¯Šà®°à¯à®•à¯ˆ தடà¯à®•à¯à®•à®¿à®±à®¤à®¾ அலà¯à®²à®¤à¯ \nவேறà¯à®µà®´à®¿à®¯à®¿à®²à¯ தணிகà¯à®•à¯ˆ செயà¯à®•à®¿à®±à®¤à®¾? "
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "'ஆமà¯' தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯à®¤à¯à®¤à¯ பினà¯à®©à®°à¯ 'அடà¯à®¤à¯à®¤à¯' கிளிக௠செயà¯à®¯à®µà¯à®®à¯. தஙà¯à®•à®³à®¿à®©à¯ பà¯à®¤à®¿à®¯ bridge-களை கடà¯à®Ÿà®®à¯ˆà®•à¯à®•, \nவரிசைகளை வாகà¯à®•à®¿à®¯à®®à¯ உளà¯à®³à¯€tட௠பெடà¯à®Ÿà®¿à®¯à®¿à®²à¯ நகலà¯à®Žà®Ÿà¯à®¤à¯à®¤à¯ பேஸà¯à®Ÿà¯ செயà¯à®¯à®µà¯à®®à¯. இறà¯à®¤à®¿à®¯à®¾à®•, 'இணைகà¯à®•' கிளிக௠\nசெயà¯à®¤à®µà¯à®Ÿà®©à¯, நீஙà¯à®•à®³à¯ செலà¯à®² தயாரà¯! நீஙà¯à®•à®³à¯ பிரசà¯à®šà®¿à®©à¯ˆà®¯à¯ˆ சநà¯à®¤à®¿à®¤à¯à®¤à®¾à®²à¯, 'Tor நெடà¯à®µà¯†à®¾à®°à¯à®•à¯ அமைபà¯à®ªà¯à®•à®³à¯' \nவழிகாடà¯à®Ÿà®¿à®¯à®¿à®²à¯ உளà¯à®³ 'உதவி' பொதà¯à®¤à®¾à®©à¯ˆ கிளிக௠செயà¯à®¤à¯ மேலà¯à®®à¯ உதவி பெறவà¯à®®à¯."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "இநà¯à®¤ செயà¯à®¤à®¿à®¯à¯ˆ காடà¯à®Ÿà®µà¯à®®à¯ "
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "பழையமà¯à®±à¯ˆà®¯à®¾à®© bridge-களை விணà¯à®£à®ªà¯à®ªà®¿à®•à¯à®•à®µà¯à®®à¯."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "IPv6 bridge-களை விணà¯à®£à®ªà¯à®ªà®¿à®•à¯à®•à®µà¯à®®à¯."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Pluggable Transport bridge-களை TYPE வகையில௠விணà¯à®£à®ªà¯à®ªà®¿à®•à¯à®•à®µà¯à®®à¯."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr " BridgeDB-யà¯à®Ÿà¯ˆà®¯ பொத௠GnuPG சாவியின௠ஒர௠நகலை பெறவà¯à®®à¯."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "ஒர௠பிழையை அறிகà¯à®•à¯ˆà®šà¯†à®¯à¯à®•"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "மூல தொகà¯à®ªà¯à®ªà¯"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "மாறà¯à®±à®®à¯à®•à¯à®±à®¿à®•à¯à®•à¯à®®à¯ கோபà¯à®ªà¯"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "தொடரà¯à®ªà¯ கொளà¯"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "எலà¯à®²à®¾à®µà®±à¯à®±à¯ˆà®¯à¯à®®à¯ தேரà¯à®¨à¯à®¤à¯†à®Ÿà¯"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr " ஹோ, பிரசà¯à®šà®©à¯ˆ!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "தறà¯à®šà®®à®¯à®®à¯ Bridge-கள௠யேதà¯à®®à¯ இலà¯à®²à¯ˆ..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "à®’à®°à¯à®µà¯‡à®³à¯ˆ நீஙà¯à®•à®³à¯ %s à®®à¯à®¯à®±à¯à®šà®¿à®•à¯à®• பினà¯à®©à¯‡ செனà¯à®±à¯ %s வேறொர௠வகை தேரà¯à®µà¯ செயà¯à®¯à®²à®¾à®®à¯!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "அடி %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "பதிவிறகà¯à®•à®µà¯à®®à¯ %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "அடி %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "%s Bridge-களை %s பெறà¯à®•"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "அடி %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "இபà¯à®ªà¯Šà®´à¯à®¤à¯ %s bridge-களை Tor Browser-உள௠%s சேரà¯à®•à¯à®•à®µà¯à®®à¯"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sநே%sரயடியாக bridge-களை கொடà¯à®•à¯à®•à®µà¯à®®à¯!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "மேமà¯à®ªà®Ÿà¯à®Ÿ விரà¯à®ªà¯à®ªà®™à¯à®•à®³à¯"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "இலà¯à®²à¯ˆ"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sபெ%sà®°à¯à®• Bridge-களை"
diff --git a/te_IN/LC_MESSAGES/bridgedb.po b/te_IN/LC_MESSAGES/bridgedb.po
index aeb07eb..9d8bdfb 100644
--- a/te_IN/LC_MESSAGES/bridgedb.po
+++ b/te_IN/LC_MESSAGES/bridgedb.po
@@ -9,7 +9,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-10-16 14:54+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: decode_dev <gh0sthack3r007 at gmail.com>\n"
"Language-Team: Telugu (India) (http://www.transifex.com/otf/torproject/language/te_IN/)\n"
"MIME-Version: 1.0\n"
diff --git a/th/LC_MESSAGES/bridgedb.po b/th/LC_MESSAGES/bridgedb.po
index 13e57f2..95d690f 100644
--- a/th/LC_MESSAGES/bridgedb.po
+++ b/th/LC_MESSAGES/bridgedb.po
@@ -12,7 +12,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-11-27 03:24+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Ella Rudland <atwwtkp at gmail.com>\n"
"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\n"
"MIME-Version: 1.0\n"
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index 56066a2..b5f34b3 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -27,7 +27,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-07 20:18+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Volkan Gezer <volkangezer at gmail.com>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
diff --git a/uk/LC_MESSAGES/bridgedb.po b/uk/LC_MESSAGES/bridgedb.po
index 5a99cbc..98dc64e 100644
--- a/uk/LC_MESSAGES/bridgedb.po
+++ b/uk/LC_MESSAGES/bridgedb.po
@@ -12,14 +12,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-07-13 17:46+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Yasha <yasha88888 at hotmail.com>\n"
-"Language-Team: Ukrainian (http://www.transifex.com/projects/p/torproject/language/uk/)\n"
+"Language-Team: Ukrainian (http://www.transifex.com/otf/torproject/language/uk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: uk\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
@@ -34,57 +35,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Ми приноÑимо наші вибаченнÑ! ЩоÑÑŒ пішло не так з Вашим запитом."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Повідомити про помилку"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Код"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "СпиÑок змін"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Контакт"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Вибрати вÑÑ–"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Показати QR-код"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR-код Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑлÑторів"
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Ой-ой, spaghettios!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "ЗдаєтьÑÑ, було помилкою Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ QR-код."
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Це QR-код міÑтить адреÑи Ваших ретранÑлÑторів. ВідÑкануйте його приÑтроєм Ð´Ð»Ñ Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ QR-кодів, щоб Ñкопіювати адреÑи Ваших ретранÑлÑторів на мобільні та інші приÑтрої."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð’ даний Ñ‡Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” доÑтупних моÑтів ..."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Можливо, Вам Ñлід Ñпробувати %s повернутиÑÑ %s Ñ– вибрати інший тип моÑту!"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Крок %s1%s"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Завантажити %s Tor Browser %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Крок %s2%s"
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Отримайте %s моÑти %s"
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "Крок %s3%s"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Тепер %s додай bridges до Tor Browser %s"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sТ%sільки дай мені моÑти!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Розширені Параметри"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "ÐÑ–"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "жоден"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sО%sтримати моÑти"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Це автоматичне повідомленнÑ; будь лаÑка, не відповідайте.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Ваші моÑти:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Ви перевищили Ð¾Ð±Ð¼ÐµÐ¶ÐµÐ½Ð½Ñ ÑˆÐ²Ð¸Ð´ÐºÐ¾ÑÑ‚Ñ–. Будь лаÑка, уповільнітьÑÑ! Мінімальний Ñ‡Ð°Ñ Ð¼Ñ–Ð¶\nлиÑтами %s годин. Ð’ÑÑ– подальші лиÑти в цей період чаÑу будуть ігноруватиÑÑ."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr "Команди: (комбінувати команди вказавши кілька варіантів одночаÑно)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "ЛаÑкаво проÑимо у BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "У даний Ñ‡Ð°Ñ Ð¿Ñ–Ð´Ñ‚Ñ€Ð¸Ð¼ÑƒÑŽÑ‚ÑŒÑÑ transport TYPE:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Привіт, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Привіт, друже!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -95,7 +221,7 @@ msgstr "Цей лиÑÑ‚ був згенеровано з райдугами, Ñ”
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -106,7 +232,7 @@ msgid ""
msgstr "BridgeDB може забезпечити bridges з декількома %sтипами Pluggable Transports%s,\nÑкі можуть допомогти приховати Ñвої зв'Ñзки з Tor мережею, що уÑкладнює роботу\nÐ´Ð»Ñ Ñ‚Ð¸Ñ…, хто перевірÑÑ” Ваш інтернет-трафік, щоб визначити, що Ви\nвикориÑтовуєте Tor. \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -118,7 +244,7 @@ msgstr "ДеÑкі моÑти з адреÑами IPv6, також доÑтуп
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -127,20 +253,20 @@ msgid ""
"\n"
msgstr "Крім того, BridgeDB має багато plain-ol'-vanilla bridges %s без\nPluggable Transports %s, Ñкі, можливо, не звучать гарно, але вони \nможуть допомогти обійти інтернет-цензуру в багатьох випадках.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Що таке ретранÑлÑтор типу міÑÑ‚?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s МоÑти %s Ñ” Tor реле, Ñкі допоможуть Вам обійти цензуру."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Мені потрібен альтернативний ÑпоÑіб Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ ÑпиÑку моÑтів!"
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -148,12 +274,12 @@ msgid ""
"%s, %s or %s."
msgstr "Ще один ÑпоÑіб отримати bridges - це відправити лиÑÑ‚ на адреÑу %s. Зверніть увагу, що\nВи повинні надіÑлати лиÑÑ‚, викориÑтовуючи адреÑу від одного з наÑтупних поÑтачальників\nпоÑлуг електронної пошти:\n%s, %s або %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "Мої моÑти не працюють! Допоможіть!"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr "Якщо Ваш Tor не працює, Ви можете відправити нам електронного лиÑта %s."
@@ -161,48 +287,48 @@ msgstr "Якщо Ваш Tor не працює, Ви можете відправ
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list 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:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Лінії Ð´Ð»Ñ Ð’Ð°ÑˆÐ¾Ð³Ð¾ моÑту:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Отримати Bridges!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Будь лаÑка, оберіть параметри типу міÑÑ‚:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Вам потрібні адреÑи IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Вам потрібен %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "Ваш браузер не відображає Ð·Ð¾Ð±Ñ€Ð°Ð¶ÐµÐ½Ð½Ñ Ð½Ð°Ð»ÐµÐ¶Ð½Ð¸Ð¼ чином."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Введіть зображенні Ñимволи ..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Як почати кориÑтуватиÑÑ Ð’Ð°ÑˆÐ¸Ð¼Ð¸ моÑтами"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -211,21 +337,21 @@ msgid ""
msgstr "Щоб додати ретранÑлÑтори у Tor Browser, Ñпочатку ідіть на %s Ñторінку Ð·Ð°Ð²Ð°Ð½Ñ‚Ð°Ð¶ÐµÐ½Ð½Ñ Tor Browser %s а потім Ñлідуйте інÑтрукціÑм Ð´Ð»Ñ ÑÐºÐ°Ñ‡ÑƒÐ²Ð°Ð½Ð½Ñ Ñ– запуÑку Tor Browser."
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr "Коли діалог \"ÐÐ°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð¼ÐµÑ€ÐµÐ¶Ñ– Tor\" відкриєтьÑÑ, натиÑніть \"Ðалаштувати\" Ñ– дотримуйтеÑÑŒ\nпідказкам майÑтра, допоки він не запроÑить:"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr "Вашій інтернет-провайдер (ISP) блокує або цензурує з'єднаннÑ\nдо мережі Tor?"
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -233,153 +359,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Виберіть \"Так\", а потім натиÑніть \"Далі\". Ð”Ð»Ñ Ð½Ð°Ð»Ð°ÑˆÑ‚ÑƒÐ²Ð°Ð½Ð½Ñ Ð½Ð¾Ð²Ð¸Ñ… bridges, Ñкопіюйте Ñ–\nвÑтавте лінії bridge у поле Ð´Ð»Ñ Ð²Ð²ÐµÐ´ÐµÐ½Ð½Ñ Ñ‚ÐµÐºÑту. Потім, натиÑніть 'ПідключатиÑÑ', Ñ–\nвÑе повинно працювати! Якщо у Ð’Ð°Ñ Ð²Ð¸Ð½Ð¸ÐºÐ»Ð¸ проблеми, Ñпробуйте натиÑнути \"Довідка\" \nв майÑтрові \"Мережеві параметри Tor' Ð´Ð»Ñ Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð´Ð¾Ð´Ð°Ñ‚ÐºÐ¾Ð²Ð¾Ñ— допомоги."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Відображає це повідомленнÑ."
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr "Запит на Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ vanilla bridges."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Запит на Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ IPv6 bridges."
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Запит на Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Pluggable Transport по TYPE."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Отримати копію відкритого GnuPG ключа Ð´Ð»Ñ BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Повідомити про помилку"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Код"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "СпиÑок змін"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Контакт"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Вибрати вÑÑ–"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Показати QR-код"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "QR-код Ð´Ð»Ñ Ð°Ð´Ñ€ÐµÑ Ñ€ÐµÑ‚Ñ€Ð°Ð½ÑлÑторів"
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Ой-ой, spaghettios!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "ЗдаєтьÑÑ, було помилкою Ð¾Ñ‚Ñ€Ð¸Ð¼Ð°Ð½Ð½Ñ Ð²Ð°ÑˆÐ¾Ð³Ð¾ QR-код."
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr "Це QR-код міÑтить адреÑи Ваших ретранÑлÑторів. ВідÑкануйте його приÑтроєм Ð´Ð»Ñ Ð·Ñ‡Ð¸Ñ‚ÑƒÐ²Ð°Ð½Ð½Ñ QR-кодів, щоб Ñкопіювати адреÑи Ваших ретранÑлÑторів на мобільні та інші приÑтрої."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ð’ даний Ñ‡Ð°Ñ Ð½ÐµÐ¼Ð°Ñ” доÑтупних моÑтів ..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Можливо, Вам Ñлід Ñпробувати %s повернутиÑÑ %s Ñ– вибрати інший тип моÑту!"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "Крок %s1%s"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "Завантажити %s Tor Browser %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "Крок %s2%s"
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "Отримайте %s моÑти %s"
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "Крок %s3%s"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Тепер %s додай bridges до Tor Browser %s"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sТ%sільки дай мені моÑти!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Розширені Параметри"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "ÐÑ–"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sО%sтримати моÑти"
diff --git a/ur_PK/LC_MESSAGES/bridgedb.po b/ur_PK/LC_MESSAGES/bridgedb.po
index 45b7766..5485f1a 100644
--- a/ur_PK/LC_MESSAGES/bridgedb.po
+++ b/ur_PK/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-08-25 09:06+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Umar Hayat\n"
"Language-Team: Urdu (Pakistan) (http://www.transifex.com/otf/torproject/language/ur_PK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: ur_PK\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr ""
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Ù…Ø³Ø¦Ù„Û Ø±Ù¾ÙˆØ±Ù¹ کریں"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "سورس کوڈ"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Ù†Ûیں"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "کوئی Ù†Ûیں"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[ÛŒÛ Ø§ÛŒÚ© خودکار پیغام ÛÛ’: Ø¨Ø±Ø§Û Ù…Ûربانی جواب Ù†Û Ø¯ÛŒØ¬ÛŒÛ’]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB میں خوش آمدید"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Ûیلو ØŒ %s"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Ûیلو دوستو!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
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:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -157,48 +283,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "کیا آپ کو ایک %s چائیے ؟"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Ù…Ø³Ø¦Ù„Û Ø±Ù¾ÙˆØ±Ù¹ کریں"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "سورس کوڈ"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Ù†Ûیں"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/uz/LC_MESSAGES/bridgedb.po b/uz/LC_MESSAGES/bridgedb.po
index 1bcbe6c..4a0cf0c 100644
--- a/uz/LC_MESSAGES/bridgedb.po
+++ b/uz/LC_MESSAGES/bridgedb.po
@@ -8,14 +8,15 @@
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-04-19 08:23+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: runasand <runa.sandvik at gmail.com>\n"
-"Language-Team: Uzbek (http://www.transifex.com/projects/p/torproject/language/uz/)\n"
+"Language-Team: Uzbek (http://www.transifex.com/otf/torproject/language/uz/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: uz\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Uzr, nimadir xato ketdi."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Kod"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "O'zgarishlar"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Bog'lanish"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr "Voy savil!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s-qadam"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Ilg'or moslamalar"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Yo'q"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "hechbir"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sH%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"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Bu avtomat yuborilgan xabar, iltimos, javob yozmang.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Ko'priklaringiz:"
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "BridgeDB'ga xush kelibsiz!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr ""
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Salom, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Salom, do'st!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Ommaviy kalitlar"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "Ushbu e-mail %s uchun %s kuni soat %s da yozildi."
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Ko'priklar nima?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ko'priklar %s Tor bog'lanish nuqtalari bo'lib, senzurani aylanib o'tishingizga yordam beradi."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -157,48 +283,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Kod"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "O'zgarishlar"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Bog'lanish"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr "Voy savil!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "%s3%s-qadam"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Ilg'or moslamalar"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Yo'q"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "hechbir"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:127
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sH%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:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/vi/LC_MESSAGES/bridgedb.po b/vi/LC_MESSAGES/bridgedb.po
index b36f71a..35164ea 100644
--- a/vi/LC_MESSAGES/bridgedb.po
+++ b/vi/LC_MESSAGES/bridgedb.po
@@ -4,18 +4,19 @@
#
# Translators:
# Khanh Nguyen <nguyenduykhanh85 at gmail.com>, 2015
-# Tuan Duc Dang <dwayne.dang at yahoo.com>, 2015
+# Tuan Duc Dang <inactive+721411 at transifex.com>, 2015
msgid ""
msgstr ""
"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'POT-Creation-Date: 2015-03-19 22:13+0000\n"
-"PO-Revision-Date: 2015-08-13 04:03+0000\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Khanh Nguyen <nguyenduykhanh85 at gmail.com>\n"
"Language-Team: Vietnamese (http://www.transifex.com/otf/torproject/language/vi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
@@ -30,57 +31,182 @@ msgstr ""
#. "fteproxy"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:107
+#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
msgstr "Xin lỗi! Có vấn đỠvới yêu cầu của bạn."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr ""
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Chá»n Tất cả"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#. 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!". :)
+#: bridgedb/https/templates/bridges.html:67
+#: bridgedb/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:73
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:27
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:36
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. (These are used to insert HTML5 underlining tags, to mark accesskeys
+#. for disabled users.)
+#: bridgedb/https/templates/options.html:38
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "Không"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Äây là thông Ä‘iệp tá»± Ä‘á»™ng; xin đừng trả lá»i]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr ""
-#: lib/bridgedb/strings.py:22
+#: bridgedb/strings.py:47
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr ""
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Chà o mừng đến với BridgeDB!"
#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
+#: bridgedb/strings.py:55
msgid "Currently supported transport TYPEs:"
msgstr "transport TYPEs được há»— trợ hiện thá»i:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hây, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Chà o bạn!"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:100
+#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
msgid "Public Keys"
msgstr "Các khoá Công cộng"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice at example.com on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -91,7 +217,7 @@ msgstr "Email nà y được tạo bởi cầu vồng, kỳ lân và ánh sáng l
#. 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
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +228,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: lib/bridgedb/strings.py:54
+#: bridgedb/strings.py:79
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -114,7 +240,7 @@ msgstr "Một và i cầu với địa chỉ IPv6 cũng đang có sẵn, mặc d
#. 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
+#: bridgedb/strings.py:88
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -123,20 +249,20 @@ msgid ""
"\n"
msgstr ""
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr ""
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr ""
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:83
+#: bridgedb/strings.py:108
#, python-format
msgid ""
"Another way to get bridges is to send an email to %s. Please note that you must\n"
@@ -144,12 +270,12 @@ msgid ""
"%s, %s or %s."
msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
+#: bridgedb/strings.py:117
#, python-format
msgid "If your Tor doesn't work, you should email %s."
msgstr ""
@@ -157,48 +283,48 @@ msgstr ""
#. 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
+#: bridgedb/strings.py:121
msgid ""
"Try including as much info about your case as you can, including the list of\n"
"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
"and any messages which Tor gave out, etc."
msgstr "Cố gắng cung cấp cà ng nhiá»u thông tin vá» trÆ°á»ng hợp của bạn nếu có thể, bao gồm danh sách những\ncầu và Pluggable Transports mà bạn đã cố gắng sá» dụng, phiên bản của trình duyệt Tor, và bất kỳ thông Ä‘iệp nà o mà Tor Ä‘Æ°Æ¡c ra, v.v"
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr ""
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr ""
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr ""
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr ""
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr ""
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#: bridgedb/strings.py:146
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -207,21 +333,21 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:126
+#: bridgedb/strings.py:151
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
"the wizard until it asks:"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:130
+#: bridgedb/strings.py:155
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
"to the Tor network?"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:134
+#: bridgedb/strings.py:159
msgid ""
"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
@@ -229,153 +355,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr ""
#. 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:146
+#: bridgedb/strings.py:171
msgid "Request vanilla bridges."
msgstr ""
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:149
+#: bridgedb/strings.py:174
msgid "Request a Pluggable Transport by TYPE."
msgstr "Yêu cầu một Pluggable Transport bởi TYPE"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: lib/bridgedb/strings.py:152
+#: bridgedb/strings.py:177
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr "Lấy bản sao của BridgeDB's khóa GnuPG công cộng."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr ""
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Chá»n Tất cả"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr ""
-
-#. 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:115
-#: lib/bridgedb/templates/bridges.html:175
-msgid "Uh oh, spaghettios!"
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:121
-msgid ""
-"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
-" your bridge lines onto mobile and other devices."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr ""
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr ""
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. (These are used to insert HTML5 underlining tags, to mark accesskeys
-#. for disabled users.)
-#: lib/bridgedb/templates/options.html:38
-#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr ""
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "Không"
-
-#: 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:127
-#, python-format
-msgid "%sY%ses!"
-msgstr ""
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:151
-#, python-format
-msgid "%sG%set Bridges"
-msgstr ""
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index 4e18d8d..03a6ac6 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -17,7 +17,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-03 19:52+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Meng3\n"
"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\n"
"MIME-Version: 1.0\n"
diff --git a/zh_HK/LC_MESSAGES/bridgedb.po b/zh_HK/LC_MESSAGES/bridgedb.po
index ffe9043..2c7360c 100644
--- a/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/zh_HK/LC_MESSAGES/bridgedb.po
@@ -10,7 +10,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2015-12-22 12:26+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: Wen-Gan Li <wgli at wgli.net>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
diff --git a/zh_TW/LC_MESSAGES/bridgedb.po b/zh_TW/LC_MESSAGES/bridgedb.po
index 90eeb3c..769c8aa 100644
--- a/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/zh_TW/LC_MESSAGES/bridgedb.po
@@ -13,7 +13,7 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
"POT-Creation-Date: 2015-07-25 03:40+0000\n"
-"PO-Revision-Date: 2016-01-09 12:12+0000\n"
+"PO-Revision-Date: 2016-03-21 16:27+0000\n"
"Last-Translator: AgustÃn Wu <losangwuyts at gmail.com>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
More information about the tor-commits
mailing list