[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [translation/bridgedb_completed] Update translations for bridgedb_completed
commit bea84dcfbe4f34a9f15fd040302d3192d8fec6d4
Author: Translation commit bot <translation@xxxxxxxxxxxxxx>
Date: Wed Jan 6 12:45:25 2016 +0000
Update translations for bridgedb_completed
---
ar/LC_MESSAGES/bridgedb.po | 4 +-
bg/LC_MESSAGES/bridgedb.po | 338 ++++++++++++++++++++--------------------
ca/LC_MESSAGES/bridgedb.po | 341 ++++++++++++++++++++--------------------
pt_BR/LC_MESSAGES/bridgedb.po | 6 +-
tr/LC_MESSAGES/bridgedb.po | 12 +-
zh_CN/LC_MESSAGES/bridgedb.po | 343 +++++++++++++++++++++--------------------
6 files changed, 524 insertions(+), 520 deletions(-)
diff --git a/ar/LC_MESSAGES/bridgedb.po b/ar/LC_MESSAGES/bridgedb.po
index baf5b21..8105ab9 100644
--- a/ar/LC_MESSAGES/bridgedb.po
+++ b/ar/LC_MESSAGES/bridgedb.po
@@ -25,8 +25,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-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-10 21:25+0000\n"
-"Last-Translator: yahia zakaria <yahiazak@xxxxxxxxxxx>\n"
+"PO-Revision-Date: 2016-01-03 11:13+0000\n"
+"Last-Translator: ouss <oussjarrouse@xxxxxxxxx>\n"
"Language-Team: Arabic (http://www.transifex.com/otf/torproject/language/ar/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
diff --git a/bg/LC_MESSAGES/bridgedb.po b/bg/LC_MESSAGES/bridgedb.po
index b01866e..7ff24b4 100644
--- a/bg/LC_MESSAGES/bridgedb.po
+++ b/bg/LC_MESSAGES/bridgedb.po
@@ -4,18 +4,20 @@
#
# Translators:
# aramaic <aramaicbg@xxxxxxxxx>, 2015
+# Maxi <kutia0001@xxxxxxxxx>, 2015
# Tsvetan Nikolov <slakware@xxxxxxxxx>, 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-11 13:22+0000\n"
-"Last-Translator: Tsvetan Nikolov <slakware@xxxxxxxxx>\n"
+"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
+"POT-Creation-Date: 2015-07-25 03:40+0000\n"
+"PO-Revision-Date: 2015-12-22 07:09+0000\n"
+"Last-Translator: Maxi <kutia0001@xxxxxxxxx>\n"
"Language-Team: Bulgarian (http://www.transifex.com/otf/torproject/language/bg/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 0.9.6\n"
+"Generated-By: Babel 1.3\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -30,68 +32,193 @@ 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 "Ð?збeÑ?и вÑ?иÑ?ко"
+
+#: 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 Ð?од за ваÑ?иÑ?е 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 "Ð?оо, Ñ?пагеÑ?ки!"
+
+#: 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 "Този QRCode Ñ?Ñ?дÑ?Ñ?жа ваÑ?иÑ?е моÑ?Ñ?ови линии. СканиÑ?айÑ?е го Ñ? QR Ð?од Ñ?еÑ?еÑ? да копиÑ?аÑ?е ваÑ?иÑ?е моÑ?Ñ?ови линии кÑ?м мобилни и дÑ?Ñ?ги Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва."
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "Ð? моменÑ?а нÑ?ма налиÑ?ни bridges ..."
+
+#: 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 и избеÑ?еÑ?е Ñ?азлиÑ?енt bridge Ñ?ип!"
+
+#: 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 "Сега %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Ñ?оÑ?Ñ?о ми дайÑ?е 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 "%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 "Това Ñ?а ваÑ?иÑ?е мÑ?ежови 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 "COMMANDs: (комбиниÑ?ай 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@xxxxxxxxxxx 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"
"for %s on %s at %s."
-msgstr "Този е-поÑ?а беÑ?е генеÑ?иÑ?ана Ñ? дÑ?ги, Ñ?никоÑ?ни, и заÑ?Ñ?\nза %s в %s в %s."
+msgstr "Този е-поÑ?а беÑ?е генеÑ?иÑ?ана Ñ? дÑ?ги, едноÑ?ози, и заÑ?Ñ?\nза %s в %s в %s."
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor".
#. TRANSLATORS: Please DO NOT translate "Tor Network".
-#: lib/bridgedb/strings.py:47
+#: bridgedb/strings.py:72
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -102,7 +229,7 @@ msgid ""
msgstr "BridgeDB може да пÑ?едложи bridges Ñ? много %sвидове на Pluggable Transports%s,\nкоиÑ?о могаÑ? да помогнаÑ? да подÑ?игÑ?Ñ?Ñ?Ñ? ваÑ?аÑ?а вÑ?Ñ?зка кÑ?м Tor Network, пÑ?авейки Ñ? по\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"
@@ -114,7 +241,7 @@ msgstr "Ð?Ñ?кой bridges Ñ? 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"
@@ -123,20 +250,20 @@ msgid ""
"\n"
msgstr "Ð?опÑ?лниÑ?елно, BridgeDB има много plain-ol'-vanilla bridges %s без никакви\nPluggable 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 Bridges %s Ñ?а Tor relays коиÑ?о помагаÑ? за заобикалÑ?не на Ñ?ензÑ?Ñ?аÑ?а."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?мам нÑ?жда оÑ? алÑ?еÑ?наÑ?ивен ваÑ?ианÑ? за намиÑ?ане на 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"
@@ -144,12 +271,12 @@ msgid ""
"%s, %s or %s."
msgstr "Ð?Ñ?Ñ?г ваÑ?ианÑ? за набавÑ?не на bridges е пÑ?аÑ?ане на е-поÑ?а до %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 "Ð?оиÑ?е bridges не Ñ?абоÑ?Ñ?Ñ?! Ð?мам нÑ?жда оÑ? помоÑ?!"
#. 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 +284,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 Browser веÑ?Ñ?иÑ?,\nи вÑ?Ñ?ко Ñ?Ñ?обÑ?ение Ñ? коеÑ?о Tor е оÑ?говоÑ?ил, и Ñ?.н."
-#: 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 "Ð?земеÑ?е Bridges!"
-#: 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 "Ð?аÑ?иÑ? бÑ?аÑ?зеÑ? не показва пÑ?авилно изобÑ?ажениÑ?."
-#: 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 "Ð?ак да запоÑ?неÑ?е да използваÑ?е ваÑ?иÑ?е 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"
@@ -207,21 +334,21 @@ msgid ""
msgstr "Ð?а вÑ?веждане на bridges в Tor Browser, пÑ?Ñ?во оÑ?идеÑ?е на \n%s Tor Browser Ñ?еб Ñ?Ñ?Ñ?аниÑ?аÑ?а за Ñ?валÑ?не %s и Ñ?лед Ñ?ова \nÑ?ледвайÑ?е инÑ?Ñ?Ñ?Ñ?кÑ?ииÑ?е Ñ?ам за Ñ?валÑ?не и Ñ?Ñ?аÑ?Ñ?иÑ?ане на \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 "Ð?огаÑ?о 'Tor Network Settings' пÑ?озоÑ?еÑ? Ñ?е оÑ?воÑ?и, кликнеÑ?е 'Configure' и Ñ?ледвайÑ?е\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"
@@ -229,153 +356,28 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr "Ð?збеÑ?еÑ?е 'Ð?а' и Ñ?лед Ñ?ова кликнеÑ?е 'Ð?апÑ?ед'. Ð?а да конÑ?игÑ?Ñ?иÑ?аÑ?е ваÑ?иÑ?е нови bridges, копиÑ?айÑ?е и\nпоÑ?Ñ?авеÑ?е bridge Ñ?едовеÑ?е в пÑ?озоÑ?еÑ?а за Ñ?екÑ?Ñ?ово вÑ?веждане. Ð?а кÑ?аÑ? наÑ?иÑ?неÑ?е 'СвÑ?Ñ?жи Ñ?е', и\nÑ?Ñ?Ñ?бва да Ñ?Ñ?е гоÑ?ови! Ð?ко Ñ?Ñ?еÑ?аÑ?е Ñ?Ñ?Ñ?дноÑ?Ñ?и, оÑ?идеÑ?е на 'Ð?омоÑ?' бÑ?Ñ?она в 'Tor Network Settings' Ñ?Ñ?веÑ?ника за помоÑ?."
-#: 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 "Ð?аÑ?ви Ñ?Ñ?андаÑ?Ñ?ни 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 "Ð?земи копие на BridgeDB's обÑ?еÑ?Ñ?вен 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 Ð?од за ваÑ?иÑ?е 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 "Ð?оо, Ñ?пагеÑ?ки!"
-
-#: 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 "Този QRCode Ñ?Ñ?дÑ?Ñ?жа ваÑ?иÑ?е моÑ?Ñ?ови линии. СканиÑ?айÑ?е го Ñ? QR Ð?од Ñ?еÑ?еÑ? да копиÑ?аÑ?е ваÑ?иÑ?е моÑ?Ñ?ови линии кÑ?м мобилни и дÑ?Ñ?ги Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва."
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "Ð? моменÑ?а нÑ?ма налиÑ?ни bridges ..."
-
-#: 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 и избеÑ?еÑ?е Ñ?азлиÑ?енt bridge Ñ?ип!"
-
-#: 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 "Сега %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Ñ?оÑ?Ñ?о дайÑ?е ми 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 "%sÐ?%sземи Bridges"
diff --git a/ca/LC_MESSAGES/bridgedb.po b/ca/LC_MESSAGES/bridgedb.po
index 58da8f9..4204f15 100644
--- a/ca/LC_MESSAGES/bridgedb.po
+++ b/ca/LC_MESSAGES/bridgedb.po
@@ -13,14 +13,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-12 16:07+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: 2015-12-18 19:02+0000\n"
"Last-Translator: laia_\n"
"Language-Team: Catalan (http://www.transifex.com/otf/torproject/language/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: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 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 "Quelcom ha anat malament amb la petició."
-#: lib/bridgedb/strings.py:18
+#: bridgedb/https/templates/base.html:79
+msgid "Report a Bug"
+msgstr "Comunica un error"
+
+#: bridgedb/https/templates/base.html:82
+msgid "Source Code"
+msgstr "Codi font"
+
+#: bridgedb/https/templates/base.html:85
+msgid "Changelog"
+msgstr "Registre de canvis"
+
+#: bridgedb/https/templates/base.html:88
+msgid "Contact"
+msgstr "Contacte"
+
+#: bridgedb/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Selecciona-ho tot"
+
+#: bridgedb/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Mostra el codi QR"
+
+#: bridgedb/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Codi QR per les lÃnies de ponts"
+
+#. TRANSLATORS: Please translate this into some silly way 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 "Vatua l'olla!"
+
+#: bridgedb/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr "Hi ha hagut un error en obtenir el codi 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 "Aquest codi QR conté les lÃnies de pont. Escannegeu-lo amb un lector de codis QR per copiar les lÃnies de pont al mòbil i a altres dispositius. "
+
+#: bridgedb/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr "No hi ha ponts disponibles en aquests moments."
+
+#: bridgedb/https/templates/bridges.html:132
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Proveu %s tornant a %s i triant un tipus diferent de pont."
+
+#: 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 "Descarrega %s Navegador Tor %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 "Descarrega %s ponts %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 "Ara %s adjunta els ponts al 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 donem els meus bridges!"
+
+#: bridgedb/https/templates/options.html:51
+msgid "Advanced Options"
+msgstr "Opcions Avançades"
+
+#: bridgedb/https/templates/options.html:86
+msgid "No"
+msgstr "No"
+
+#: bridgedb/https/templates/options.html:87
+msgid "none"
+msgstr "Cap"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
+#: bridgedb/https/templates/options.html:124
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sS%sÃ!"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/https/templates/options.html:147
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sD%sescarrega Bridges"
+
+#: bridgedb/strings.py:43
msgid "[This is an automated message; please do not reply.]"
msgstr "[Aquest és un missatge automà tic, no el respongui.]"
-#: lib/bridgedb/strings.py:20
+#: bridgedb/strings.py:45
msgid "Here are your bridges:"
msgstr "Els vostres 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 "Heu superat el lÃmit. El mÃnim de temps entre\nels correus és de %s hores. La resta de correus durant aquest perÃode de temps seran ignorats."
-#: lib/bridgedb/strings.py:25
+#: bridgedb/strings.py:50
msgid ""
"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina COMMANDs per especificar les múltiples opcions simultà niament)"
+msgstr "COMMANDs: (combina COMMANDs per especificar diverses opcions simultà niament)"
#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
+#: bridgedb/strings.py:53
msgid "Welcome to BridgeDB!"
msgstr "Benvingut a 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 "Actualment suportant transport TYPEs:"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/strings.py:56
#, python-format
msgid "Hey, %s!"
msgstr "Hola, %s!"
-#: lib/bridgedb/strings.py:32
+#: bridgedb/strings.py:57
msgid "Hello, friend!"
msgstr "Hola, amic!"
-#: 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 "Claus Públiques"
#. TRANSLATORS: This string will end up saying something like:
#. "This email was generated with rainbows, unicorns, and sparkles
#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: lib/bridgedb/strings.py:37
+#: bridgedb/strings.py:62
#, python-format
msgid ""
"This email was generated with rainbows, unicorns, and sparkles\n"
@@ -96,7 +222,7 @@ msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martà i espurnes\
#. TRANSLATORS: 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,10 +230,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difÃcil determinar que esteu usant Tor a qualsevol que vegi el vostre trà fic de connexió a\ninternet \n"
+msgstr "BridgeDB pot proveïr ponts amb diversos %stypes de Pluggable Transports%s,\nque poden provocar ofuscacions a la vostra connexió a Tor Network, fent més difÃcil determinar que esteu usant Tor a qualsevol que vegi el vostre trà fic de connexió a\ninternet. \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 "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Plugga
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable 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 "A més a més, BridgeDB té molts ponts %s està ndard sense \nPluggable Transports %s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet en molts casos.\n"
-#: lib/bridgedb/strings.py:76
+#: bridgedb/strings.py:101
msgid "What are bridges?"
msgstr "Què són els 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 Ponts %s són repetidors Tor que ajuden a esquivar la censura."
-#: lib/bridgedb/strings.py:82
+#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
msgstr "Em cal una manera alternativa d'obtenir 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"
@@ -149,61 +275,61 @@ msgid ""
"%s, %s or %s."
msgstr "Una altra manera d'aconseguir ponts és enviar un correu electrònic a %s. Tingueu en compte que heu\nd'enviar el correu amb una adreça d'un dels següents proveïdors de correu:\n%s, %s or %s."
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:115
msgid "My bridges don't work! I need help!"
msgstr "No em funcionen els ponts! Ajuda!"
#. 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 Tor no us funciona, haurÃeu d'enviar un correu a %s."
+msgstr "Si Tor no us funciona, envieu un correu 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 "Incloeu el mà xim d'informació sobre el vostre cas, inclosa la llista de\nponts i de Pluggable Transports que heu intentat utilizar, la vostra versió de Tor Browser,\ni qualsevol missatge que Tor hagi donat, etc."
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:128
msgid "Here are your bridge lines:"
msgstr "Les vostres lÃnies de ponts:"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:129
msgid "Get Bridges!"
msgstr "Descarregueu ponts!"
-#: lib/bridgedb/strings.py:108
+#: bridgedb/strings.py:133
msgid "Please select options for bridge type:"
msgstr "Seleccioneu les opcions pel tipus de pont:"
-#: lib/bridgedb/strings.py:109
+#: bridgedb/strings.py:134
msgid "Do you need IPv6 addresses?"
msgstr "Necessiteu adreces IPv6?"
-#: lib/bridgedb/strings.py:110
+#: bridgedb/strings.py:135
#, python-format
msgid "Do you need a %s?"
msgstr "Necessiteu un %s?"
-#: lib/bridgedb/strings.py:114
+#: bridgedb/strings.py:139
msgid "Your browser is not displaying images properly."
msgstr "El navegador no està mostrant les imatges correctament."
-#: lib/bridgedb/strings.py:115
+#: bridgedb/strings.py:140
msgid "Enter the characters from the image above..."
msgstr "Introduïu els carà cters de la imatge superior..."
-#: lib/bridgedb/strings.py:119
+#: bridgedb/strings.py:144
msgid "How to start using your bridges"
msgstr "Com començar a utilitzar els 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"
@@ -212,21 +338,21 @@ msgid ""
msgstr "Per introduir ponts al Tor Browser, primer cal anar a %s de la pà gina de descà rrega\n%s i després seguir les instruccions per descarregar i iniciar\nel 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 "Quan aparegui el dià leg 'Configuració Xarxa Tor', clica 'Configura' i segueix\nl'auxiliar fins que pregunti:"
#. 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 "El vostre Proveïdor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa 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 "Seleccioneu 'SÃ' i després cliqueu 'Següent'. Per configurar els ponts nous, copieu i\nenganxeu les lÃnies del pont al següent quadre d'entrada de text. Finalment, cliqueu 'Connectar', i ja hauria d'estar a punt! Si teniu problemes, intenteu clicar el botó \nd''Ajuda' a l'auxiliar de 'Configuració Xarxa Tor' per més assistència."
-#: lib/bridgedb/strings.py:142
+#: bridgedb/strings.py:167
msgid "Displays this message."
msgstr "Mostra aquest missatge."
#. TRANSLATORS: Please try to make it 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 "Demanar ponts està ndard."
-#: lib/bridgedb/strings.py:147
+#: bridgedb/strings.py:172
msgid "Request IPv6 bridges."
msgstr "Demanar 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 "Demanar un Pluggable Transport per 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 "Fer una còpia de la clau pública GnuPG del BridgeDB."
-
-#: lib/bridgedb/templates/base.html:89
-msgid "Report a Bug"
-msgstr "Comunicar un Bug"
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Source Code"
-msgstr "Codi font"
-
-#: lib/bridgedb/templates/base.html:95
-msgid "Changelog"
-msgstr "Canviar el log"
-
-#: lib/bridgedb/templates/base.html:98
-msgid "Contact"
-msgstr "Contacte"
-
-#: lib/bridgedb/templates/bridges.html:81
-msgid "Select All"
-msgstr "Selecciona-ho tot"
-
-#: lib/bridgedb/templates/bridges.html:87
-msgid "Show QRCode"
-msgstr "Mostra el codi QR"
-
-#: lib/bridgedb/templates/bridges.html:100
-msgid "QRCode for your bridge lines"
-msgstr "Codi QR per les lÃnies de ponts"
-
-#. TRANSLATORS: Please translate this into some silly way to say
-#. "There was a 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 "Ueeeee, espaguetiiiiis!!!!"
-
-#: lib/bridgedb/templates/bridges.html:116
-msgid "It seems there was an error getting your QRCode."
-msgstr "Hi ha hagut un error en obtenir el codi 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 "Aquest codi QR conté les lÃnies de pont. Escannegeu-lo amb un lector de codis QR per copiar les lÃnies de pont al mòbil i a altres dispositius. "
-
-#: lib/bridgedb/templates/bridges.html:181
-msgid "There currently aren't any bridges available..."
-msgstr "No hi han ponts disponibles en aquests moments..."
-
-#: lib/bridgedb/templates/bridges.html:182
-#, python-format
-msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr "Potser hauries de provar %s tirant enrer %s i triant un tipus diferent de pont!"
-
-#: 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 "Descarrega %s Navegador Tor %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 "Descarrega %s ponts %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 "Ara %s adjunta els ponts al 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 donem els meus bridges!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "Opcions Avançades"
-
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "No"
-
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "Cap"
-
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html: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"
+msgstr "Descarregar una còpia de la clau pública GnuPG del BridgeDB."
diff --git a/pt_BR/LC_MESSAGES/bridgedb.po b/pt_BR/LC_MESSAGES/bridgedb.po
index 144243c..5b67aa3 100644
--- a/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/pt_BR/LC_MESSAGES/bridgedb.po
@@ -19,8 +19,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-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-09 01:27+0000\n"
-"Last-Translator: Danton Medrado\n"
+"PO-Revision-Date: 2015-12-19 19:50+0000\n"
+"Last-Translator: Communia <ameaneantie@xxxxxxxxxx>\n"
"Language-Team: Portuguese (Brazil) (http://www.transifex.com/otf/torproject/language/pt_BR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -265,7 +265,7 @@ msgstr "O que são pontes?"
#: bridgedb/strings.py:102
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Pontes %s são retransmissores Tor que ajudam a driblar a censura."
+msgstr "%s Pontes %s são relés Tor que ajudam a driblar a censura."
#: bridgedb/strings.py:107
msgid "I need an alternative way of getting bridges!"
diff --git a/tr/LC_MESSAGES/bridgedb.po b/tr/LC_MESSAGES/bridgedb.po
index f050747..e8bfdaf 100644
--- a/tr/LC_MESSAGES/bridgedb.po
+++ b/tr/LC_MESSAGES/bridgedb.po
@@ -11,15 +11,15 @@
# erg26 <ergungorler@xxxxxxxxx>, 2012
# eromytsatiffird <driffitastymore@xxxxxxxxx>, 2014
# Fomas <fomas.adana@xxxxxxxxx>, 2015
-# Idil Yuksel <perfectionne@xxxxxxxxx>, 2014
+# Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
# Kaya Zeren <kayazeren@xxxxxxxxx>, 2015
# Ozancan KarataÅ? <ozancankaratas96@xxxxxxxxxxx>, 2015
# ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
-# Idil Yuksel <perfectionne@xxxxxxxxx>, 2014
+# Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
# Sercan AltundaÅ? <>, 2012
# ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
# Tekel Bira <psycookie@xxxxxxxxx>, 2012
-# Volkan Gezer <volkangezer@xxxxxxxxx>, 2014-2015
+# Volkan Gezer <volkangezer@xxxxxxxxx>, 2014-2016
# zeki <zeki.ozguryazilim@xxxxxxxxx>, 2014
# zeki <zeki.ozguryazilim@xxxxxxxxx>, 2014
msgid ""
@@ -27,8 +27,8 @@ msgstr ""
"Project-Id-Version: The Tor Project\n"
"Report-Msgid-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 18:00+0000\n"
-"Last-Translator: Ozancan KarataÅ? <ozancankaratas96@xxxxxxxxxxx>\n"
+"PO-Revision-Date: 2016-01-04 17:11+0000\n"
+"Last-Translator: Volkan Gezer <volkangezer@xxxxxxxxx>\n"
"Language-Team: Turkish (http://www.transifex.com/otf/torproject/language/tr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -50,7 +50,7 @@ msgstr ""
#. "Tor Browser"
#: bridgedb/https/server.py:167
msgid "Sorry! Something went wrong with your request."
-msgstr "Ã?zgünüz! Ä°steÄ?iniz ile ilgili birÅ?eyler ters gitti."
+msgstr "Ã?zgünüz! Ä°steÄ?iniz ile ilgili bir Å?eyler ters gitti."
#: bridgedb/https/templates/base.html:79
msgid "Report a Bug"
diff --git a/zh_CN/LC_MESSAGES/bridgedb.po b/zh_CN/LC_MESSAGES/bridgedb.po
index 7327341..4e18d8d 100644
--- a/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/zh_CN/LC_MESSAGES/bridgedb.po
@@ -6,23 +6,24 @@
# khi, 2013
# khi, 2013
# khi, 2013
-# Christopher Meng <cickumqt@xxxxxxxxx>, 2012
+# Christopher Meng <i@xxxxxxxx>, 2012
# hanl <iamh4n@xxxxxxxxx>, 2011
-# Meng3, 2014
+# Meng3, 2014,2016
# leungsookfan <leung.sookfan@xxxxxxxxxx>, 2014
# khi, 2014-2015
# YF <yfdyh000@xxxxxxxxx>, 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 14:41+0000\n"
-"Last-Translator: khi\n"
-"Language-Team: Chinese (China) (http://www.transifex.com/projects/p/torproject/language/zh_CN/)\n"
+"Report-Msgid-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"
+"Last-Translator: Meng3\n"
+"Language-Team: Chinese (China) (http://www.transifex.com/otf/torproject/language/zh_CN/)\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: zh_CN\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 "æ?¥å?? Bug"
+
+#: 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 "è¯?è¯? %så??é??%så?°å??ä¸?页é?¢ï¼?ç?¶å??é??æ?©å?¶ä»?ç±»å??ç??ç½?æ¡¥ã??"
+
+#: bridgedb/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "第 %s 1 %s æ¥"
+
+#: bridgedb/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "�载 %s Tor ��� %s"
+
+#: bridgedb/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "第 %s 2 %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 "第 %s 3 %s æ¥"
+
+#: bridgedb/https/templates/index.html:38
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "å¦?ä½? %s å?¨ 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 " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%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 "æ?¯(%sY%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%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 "æ?¨å·²è¶?å?ºäº?å??é??é¢?ç??ç??é??å?¶ï¼?请æ?¢æ?¢æ?¥ï¼?两å°?é?®ä»¶ä¹?é?´é??è¦?æ??å°? %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 ç±»å??ï¼?"
-#: 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@xxxxxxxxxxx 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 "æ?¬é?®ä»¶æ?¯å¯¹ %s ç??è?ªå?¨å??å¤?ï¼?æ?¥æ?? %s %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"
@@ -109,7 +235,7 @@ msgid ""
msgstr "BridgeDB è?½æ??ä¾? %s å? ç§? Pluggable Transports %s ç±»å??ç½?æ¡¥ï¼?å?¯ç?¨äº?æ··æ·? Tor ç½?ç»?ç??è¿?æ?¥ï¼?ä»?è??让ç½?ç»?ç??æ?§è??é?¾ä»¥å?¤æ?ä½ å?¨ä½¿ç?¨ 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æ ¼å¼?ç??ç½?æ¡¥ï¼?ä¸?è¿?æ??äº? Pluggable Transport
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable 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,33 +256,33 @@ msgid ""
"\n"
msgstr "æ¤å¤?ï¼?BridgeDB æ??ä¾?å¾?å¤? %s é??Pluggable 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"
"send the email using an address from one of the following email providers:\n"
"%s, %s or %s."
-msgstr "å?¦ä¸?ç§?è?·å??ç½?æ¡¥ç??æ?¹å¼?æ?¯å??é??ç?µå?é?®ä»¶è?³ %sã??注æ??ï¼?å¿?须使ç?¨ç?µå?é?®ç®±å??é??请æ±?ï¼?%sã??%s æ?? %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 "å¦?æ?? Tor æ? æ³?æ£å¸¸è¿?è¡?ï¼?请å??é?®ä»¶è?³ %sã??"
@@ -164,48 +290,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 "请尽é??详ç»?å?°æ??è¿°ä½ ç??æ??å?µï¼?å??æ?¬æ??ç?¨ç??ç½?æ¡¥å??å?¶ç±»å??ï¼?Tor æµ?è§?å?¨ç??æ?¬ä»¥å??ä»»ä½? 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 æµ?è§?å?¨ä¸?载页é?¢ %s ç??说æ??ä¸?è½½å??å?¯å?¨ 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 "å½?â??Tor ç½?ç»?设置â?? 对è¯?æ¡?å?ºç?°æ?¶ï¼?ç?¹å?»â??é??ç½®â?? ï¼?ç?¶å??æ ¹æ?®å??导æ??ä½?ï¼?ç?´å?°ç??å?°ä¸?é?¢ç??é?®é¢?ï¼?"
#. 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 ç½?ç»?è¿?æ?¥è¿?è¡?审æ?¥æ??å°?é??ï¼?"
#. 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 "é??æ?©â??æ?¯â??ï¼?ç?¶å??ç?¹å?»â??ä¸?ä¸?æ¥â??ã??å¦?ä¸?æ·»å? æ?°ç??ç½?æ¡¥ï¼?请å°?ç½?æ¡¥å?°å??è¡?é??è¿?å¤?å?¶ç²?è´´ç??æ?¹å¼?è¾?å?¥å?°æ??æ?¬è¾?å?¥æ¡?ã??æ??å??ï¼?ç?¹å?»â??è¿?æ?¥â??å°±å?¯ä»¥è¿?æ?¥è?³ Tor ç½?ç»?ã??å¦?æ??é?®é¢?é??è¦?帮å?©ï¼?请ç?¹å?»â??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 "请æ±?æ?®é??ç½?æ¡¥ã??"
-#: 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 "æ?¥å?? Bug"
-
-#: 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 "è¯?è¯? %så??é??%så?°å??ä¸?页é?¢ï¼?ç?¶å??é??æ?©å?¶ä»?ç±»å??ç??ç½?æ¡¥ã??"
-
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "第 %s 1 %s æ¥"
-
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "�载 %s Tor ��� %s"
-
-#: lib/bridgedb/templates/index.html:25
-#, python-format
-msgid "Step %s2%s"
-msgstr "第 %s 2 %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 "第 %s 3 %s æ¥"
-
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "å¦?ä½? %s å?¨ 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 " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%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 "æ?¯(%sY%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%s)"
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits