[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[tor-commits] [bridgedb/develop] Update translations.
commit 1a42375ff5d74c3b15139a56318c41e2314741fc
Author: Philipp Winter <phw@xxxxxxxxx>
Date: Wed May 20 18:33:43 2020 -0700
Update translations.
---
bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po | 367 ++++++++++----------
bridgedb/i18n/az/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/be/LC_MESSAGES/bridgedb.po | 361 ++++++++++----------
bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po | 399 ++++++++++++++++++++++
bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po | 398 +++++++++++----------
bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po | 360 ++++++++++---------
bridgedb/i18n/da/LC_MESSAGES/bridgedb.po | 399 +++++++++++-----------
bridgedb/i18n/de/LC_MESSAGES/bridgedb.po | 360 ++++++++++---------
bridgedb/i18n/el/LC_MESSAGES/bridgedb.po | 360 ++++++++++---------
bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po | 359 +++++++++----------
bridgedb/i18n/es/LC_MESSAGES/bridgedb.po | 360 +++++++++----------
bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po | 359 ++++++++++---------
bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/et/LC_MESSAGES/bridgedb.po | 359 ++++++++++---------
bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po | 427 +++++++++++++++++++----
bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po | 373 ++++++++++----------
bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po | 363 ++++++++++----------
bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po | 399 ++++++++++++++++++++++
bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po | 399 ++++++++++++++++++++++
bridgedb/i18n/he/LC_MESSAGES/bridgedb.po | 366 ++++++++++----------
bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po | 401 +++++++++++-----------
bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po | 361 ++++++++++----------
bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/id/LC_MESSAGES/bridgedb.po | 366 ++++++++++----------
bridgedb/i18n/is/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
bridgedb/i18n/it/LC_MESSAGES/bridgedb.po | 362 ++++++++++----------
bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po | 380 +++++++++++----------
bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po | 357 ++++++++++---------
bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
bridgedb/i18n/km/LC_MESSAGES/bridgedb.po | 513 +++++++++++++++-------------
bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po | 361 ++++++++++----------
bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po | 406 ++++++++++++++++++++++
bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po | 357 ++++++++++---------
bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po | 404 ++++++++++++++++++++++
bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po | 400 ++++++++++++++++++++++
bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po | 366 ++++++++++----------
bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po | 395 +++++++++++----------
bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po | 402 ++++++++++++++++++++++
bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po | 359 ++++++++++---------
bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po | 363 ++++++++++----------
bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po | 371 ++++++++++----------
bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po | 393 +++++++++++----------
bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po | 357 ++++++++++---------
bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po | 378 ++++++++++----------
bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po | 357 ++++++++++---------
bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po | 370 ++++++++++----------
bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po | 399 ++++++++++++++++++++++
bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po | 357 ++++++++++---------
bridgedb/i18n/th/LC_MESSAGES/bridgedb.po | 436 +++++++++++++++++++----
bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po | 361 ++++++++++----------
bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po | 399 ++++++++++++++++++++++
bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po | 401 ++++++++++++++++++++++
bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po | 389 +++++++++++----------
bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po | 363 ++++++++++----------
bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po | 356 ++++++++++---------
bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po | 358 ++++++++++---------
70 files changed, 15944 insertions(+), 10200 deletions(-)
diff --git a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
index 0a071e3..2da7329 100644
--- a/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ar/LC_MESSAGES/bridgedb.po
@@ -1,11 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
+# AbdAlnour Sami <me@xxxxxxxxxxxx>, 2019
# Abderrahman Ait Ali <abde.aitali@xxxxxxxx>, 2017
# A. Hassan <a_hassan@xxxxxxxxxxx>, 2015
# Ahmad Gharbeia <gharbeia@xxxxxxxxx>, 2014
+# Ahmed IB <mee.tbhole@xxxxxxxxx>, 2019
# allamiro <allamiro@xxxxxxxxx>, 2011
# Ash <ali.shatrieh@xxxxxxxxx>, 2014
# blah bleh <wshalash@xxxxxxxxxxxxx>, 2018
@@ -15,6 +17,7 @@
# Elias Saba <elias55saba@xxxxxxxxx>, 2018
# AnonymousLady <farah.jaza@xxxxxxxxxxx>, 2014
# 0xidz <ghoucine@xxxxxxxxx>, 2014
+# hussin altiry <husss2011@xxxxxxxxx>, 2020
# lamine Kacimi <k_lamine27@xxxxxxxx>, 2015
# Khaled Hosny, 2018
# maher tharwat <mahmoud_tharwat2002@xxxxxxxxxxx>, 2016
@@ -31,116 +34,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-04-04 10:15+0000\n"
-"Last-Translator: shadows99 <nabils51@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ar\n"
"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "عذراÙ?! Øدث خطأ Ù?Ù? Ø·Ù?بÙ?."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "اÙ?Ù?غة"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ابÙ?غ عÙ? خطأ باÙ?برÙ?اÙ?ج"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ù?Ù?د اÙ?برÙ?اÙ?ج"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "اÙ?تغÙ?Ù?رات"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "اتصÙ? بÙ?ا"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Øدد اÙ?Ù?Ù?"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
-msgstr "أظÙ?ر رÙ?ز اÙ?استجابة اÙ?سرÙ?ع (QRCode)"
+msgstr "أظÙ?ر رÙ?ز اÙ?استجابة اÙ?سرÙ?ع (اÙ?بارÙ?Ù?د - QRCode)"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+msgstr "رÙ?ز اÙ?بارÙ?Ù?د Ù?خطÙ?Ø· اÙ?Ù?صÙ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
-msgstr "Ù?بدÙ? Ø£Ù? Ù?Ù?اÙ? خطأ Ù?Ù? اÙ?ØصÙ?Ù? عÙ?Ù? رÙ?زÙ? Ù?Ù?إاستجابة اÙ?سرÙ?ع."
+msgstr "Ù?بدÙ? Ø£Ù? Ù?Ù?اÙ? خطأ Ù?Ù? اÙ?ØصÙ?Ù? عÙ?Ù? رÙ?ز اÙ?بارÙ?Ù?د."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ù?ا Ù?Ù?جد Ø£Ù? bridges Ù?تاØØ© ØاÙ?Ù?ا"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "ربÙ?ا تØتاج Ø¥Ù?Ù? %s اÙ?عÙ?دة %s Ù? اختÙ?ار Ù?Ù?ع bridge Ù?ختÙ?Ù?"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "خطÙ?Ø© %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ØÙ?Ù? %s Ù?تصÙ?Ø Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "خطÙ?Ø© %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "اØصÙ? عÙ?Ù? %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "خطÙ?Ø© %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "اÙ?Ø¢Ù? %s أضÙ? اÙ?Ù?bridges Ø¥Ù?Ù? Ù?تصÙ?Ø Tor %s"
@@ -149,27 +167,27 @@ msgstr "اÙ?Ø¢Ù? %s أضÙ? اÙ?Ù?bridges Ø¥Ù?Ù? Ù?تصÙ?Ø Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sÙ?%sÙ?Ø· أعطÙ?Ù? bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Ø®Ù?ارات Ù?تÙ?دÙ?Ø©"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ù?ا"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "Ù?ا Ø´Ù?Ø¡"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sÙ?%sعÙ?!"
@@ -177,69 +195,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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 "[Ù?Ø°Ù? رساÙ?Ø© تÙ?Ù?ائÙ?Ø© Ø? اÙ?رجاء عدÙ? اÙ?رد.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ù?ذا برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? Ø¢Ù?Ù?.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "اÙ?Ù? bridges اÙ?خاصة بÙ?:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 ساعات. Ù?Ù? رسائÙ? اÙ?برÙ?د اÙ?Ù?ادÙ?Ø© Ø®Ù?اÙ? تÙ?Ù? اÙ?Ù?ترÙ? سÙ?تÙ? تجاÙ?Ù?Ù?ا."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs :(اجÙ?ع اÙ?Ù?COMMANDs Ù?تØدÙ?د Ø®Ù?ارات Ù?تعددة Ù?Ù? Ù?Ù?ت Ù?اØد)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ù?رØبا بÙ?Ù? Ù?Ù? BridgeDB"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ù?سائÙ? اÙ?Ù?Ù?Ù? اÙ?Ù?تاØÙ? TYPE:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ù?رØباØ? %s "
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ù?رØبا ,صدÙ?Ù?Ù?!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ù?ذا اÙ?برÙ?د تÙ? Ø¥Ù?شائÙ? Ù?Ù? %s Ù?Ù?Ù? %s اÙ?ساعة %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "إذا Ù?Ù? تÙ?Ù? Ù?Ø°Ù? اÙ?جسÙ?ر Ù?Ù? Ù?ا تØتاج Ø¥Ù?Ù?Ù? Ø? Ù?Ù?Ù? باÙ?رد عÙ?Ù? Ù?Ø°Ù? اÙ?رساÙ?Ø© اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù?Ø© بأØد اÙ?رسائÙ?\nاÙ?Ø£Ù?اÙ?ر اÙ?تاÙ?Ù?Ø© Ù?Ù? Ù?ص اÙ?رساÙ?Ø©:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -250,7 +236,7 @@ msgid ""
msgstr "BridgeDB Ù?ستطÙ?ع تÙ?Ù?Ù?ر %s اÙ?Ù?اع Ù?Ù? اÙ?Ù? Pluggable Transports %s Ù?Ù?Ù? تساعد عÙ?Ù? تعتÙ?Ù? اتصاÙ?اتÙ? باÙ?Ù? Tor NetworkØ? Ù? Ù?Ù?تÙ?جة Ù?Ø°Ù?Ù? Ù?Ù?Ù?Ù? Ù?Ù? اÙ?صعب عÙ?Ù? Ø£Ù? اØد Ù?راÙ?ب ØرÙ?Ø© Ù?رÙ?رÙ? عÙ?Ù? اÙ?Ø¥Ù?ترÙ?ت بتØدÙ?د اذا Ù?ا Ù?Ù?ت تستخدÙ? Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -262,7 +248,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -271,134 +257,169 @@ msgid ""
"\n"
msgstr "باÙ?أضاÙ?Ø© Ø¥Ù?Ù? Ø°Ù?Ù?Ø? BridgeDB Ù?ØتÙ?Ù? عÙ?Ù? bridges %s عادÙ?Ø© بدÙ?Ù? Ø£Ù? Pluggable Transports %s تستطÙ?ع اÙ?ضا اÙ?Ù?ساعدة Ù?Ù? اÙ?تØاÙ?Ù? عÙ?Ù? رÙ?ابة عÙ?Ù? اÙ?Ø¥Ù?ترÙ?ت Ù?Ù? اÙ?Ù?Ø«Ù?ر Ù?Ù? اÙ?اØÙ?اÙ?.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ù?ا Ù?Ù? bridgesØ?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s Ù?Ù? عبارة عÙ? Ù?رØÙ?ات Tor تساعدÙ? عÙ?Ù? اÙ?تØاÙ?Ù? عÙ?Ù? اÙ?Øجب."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ø£Øتاج Ø¥Ù?Ù? Ù?سÙ?Ù?Ø© بدÙ?Ù?Ø© Ù?Ù?ØصÙ?Ù? عÙ?Ù? bridges!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "طرÙ?Ù?Ø© أخرÙ? Ù?Ù?ØصÙ?Ù? عÙ?Ù? اÙ?جسÙ?ر Ù?Ù? Ø£Ù? ترسÙ? برÙ?د Ø¥Ù?Ù?ترÙ?Ù?Ù? Ø¥Ù?Ù? %s. Ù?رجÙ? Ù?Ù?اØظة Ø£Ù?Ù? Ù?جب إرساÙ? اÙ?برÙ?د اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù? بإستخداÙ? عÙ?Ù?اÙ? Ù?Ù? Ø£Øد Ù?زÙ?دÙ? خدÙ?ات اÙ?برÙ?د اÙ?Ø¥Ù?Ù?ترÙ?Ù?Ù? اÙ?تاÙ?Ù?Ù?Ù?: %s اÙ? %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "bridges Ù?ا تعÙ?Ù?! Ø£Ù?ا بØاجة Ø¥Ù?Ù? Ù?ساعدة!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ù?Ù? ØاÙ? عدÙ? عÙ?Ù? Tor, ارسÙ? برÙ?د اÙ?Ù?ترÙ?Ù?Ù? اÙ?Ù? %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 Ù? Pluggable Transports اÙ?Ø°Ù? تØاÙ?Ù? استخداÙ?Ù?Ù?Ø? Ù?رÙ?Ù? Ù?سخة Tor Browser Ù?Ø£Ù? رسائÙ? اظÙ?رÙ?ا TorØ? Ø¥Ù?Ø®."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "إذا Ù?Ù? Ù?Ù?در Ù?تصÙ?Ø Tor Browser عÙ?Ù? اÙ?اتصاÙ?Ø? اÙ?رجاء اÙ?اطÙ?اع عÙ?Ù? دÙ?Ù?Ù? اÙ?استخداÙ?%s Ù?بÙ?ابة اÙ?دعÙ? %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ù?ا Ù?Ù? سطÙ?ر اÙ?Ù?Bridges اÙ?خاصة بÙ?:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ø£ØصÙ? عÙ?Ù? Bridges"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ø¢Ù?Ù?ات تÙ?زÙ?ع اÙ?جسر"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Ù?ØجÙ?ز"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ù?ا Ø´Ù?Ø¡"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ù?Ù? Ù?ضÙ?Ù? Øدد اÙ?Ø®Ù?ارات Ù?Ù?Ù?ع اÙ?Ù?bridge"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ù?Ù? تØتاج عÙ?اÙ?Ù?Ù? IPv6Ø?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ù?Ù? تØتاج Ø¥Ù?Ù? %sØ?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ù?تصÙ?ØÙ? Ù?ا Ù?عرض اÙ?صÙ?ر بشÙ?Ù? صØÙ?Ø"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "أدخÙ? اÙ?ØرÙ?Ù? Ø£Ù? اÙ?أرÙ?اÙ? Ù?Ù? اÙ?صÙ?رة أعÙ?اÙ? ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ù?Ù?Ù? تبدأ باستعÙ?اÙ? اÙ?Ù?bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Ù?تتÙ?Ù?Ù? Ù?Ù? إدخاÙ? جسÙ?ر Ø¥Ù?Ù? اÙ?Ù?تصÙ?Ø TorØ? أذÙ?ب Ø¥Ù?Ù? %s صÙ?ØØ© تØÙ?Ù?Ù?ات اÙ?Ù?تصÙ?Ø Tor %s Ù?أتبع اÙ?تعÙ?Ù?Ù?ات اÙ?Ù?Ø°Ù?Ù?رة Ù?Ù?Ù?ا Ù?Ù? اجÙ? تØÙ?Ù?Ù? Ù?بدء اÙ?Ù?تصÙ?Ø Tor"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "عÙ?د ظÙ?Ù?ر شاشة 'إعدادات شبÙ?Ø© Tor'Ø? اضغط عÙ?Ù? 'تÙ?Ù?Ù?Ù?' Ù? اتبع اÙ?تعÙ?Ù?Ù?ات ØتÙ? تسأÙ?Ù? عÙ?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Ù?Ù? Ù?Ù?Ù?Ù? Ù?زÙ?د خدÙ?Ø© اÙ?Ø¥Ù?ترÙ?ت (ISP) اÙ?خاص بÙ? بÙ?Ù?ع اÙ?اتصاÙ?ات بشبÙ?Ø© Tor Ø£Ù? Ù?راÙ?بتÙ?ا بطرÙ?Ù?Ø© أخرÙ?Ø?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Ø·Ù?ب جسÙ?ر Tor غÙ?ر اÙ?Ù?Ø´Ù?شة.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "اختار 'Ù?عÙ?' Ø«Ù? 'Next' Ø«Ù? Ù?Ù? بÙ?صÙ? اÙ?Ù?bridges اÙ?جدÙ?دة Ù?Ù? اÙ?Ù?ربع. Ø«Ù? اختار 'اتصاÙ?' Ù? اذا Ù?اجÙ?تÙ? Ù?Ø´Ù?Ù?Ø© اضغط عÙ?Ù? 'Ù?ساعدة' Ù?Ù? Ù?اÙ?ذة اعداد Tor."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "أطÙ?ب bridges عادÙ?Ø©."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "أطÙ?ب IPv6 bridges"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "أطÙ?ب Pluggable Transport بÙ? TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr "(Ø·Ù?ب جسÙ?ر IPv6.)"
-#. 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 "اØصÙ? عÙ?Ù? Ù?سخة Ù?Ù? Ù?Ù?ØªØ§Ø GnuPG اÙ?عاÙ? اÙ?خاص بÙ?BridgeDB"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Ø·Ù?ب جسÙ?ر obfs4 اÙ?Ù?Ø´Ù?شة.)"
diff --git a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
index 649a847..3f3dacd 100644
--- a/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/az/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# D, 2014-2015
@@ -9,116 +9,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-01-17 21:21+0000\n"
-"Last-Translator: Emin Mastizada <emin@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: az\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ã?zr istÉ?yirik! TÉ?lÉ?binlÉ? baÄ?lı nÉ? isÉ? sÉ?hv oldu."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Dil"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Problemi XÉ?bÉ?r Ver"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "MÉ?nbÉ? Kodu"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "DÉ?yiÅ?ikliklÉ?r"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Æ?laqÉ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Hamısını Seç"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR Kodu GöstÉ?r"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Körpü sÉ?tirlÉ?riniz üçün QR Kod"
-#. 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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Görünür QR Kodunuzu almada sÉ?hv yarandı."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Bu QR Kodunda körpü sÉ?tirlÉ?riniz var. Bunu QR Kod oxuyucularla gözdÉ?n keçirin vÉ? körpü sÉ?tirlÉ?rinizi mobil vÉ? digÉ?r cihazlara köçürün."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Hazırda mümkün körpü yoxdur..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1-ci%s Addım"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor SÉ?yyahını %s Endir"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2-ci%s Addım"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Körpü %s Æ?ldÉ? Et"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "%s3-cü%s Addım"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ä°ndi %s körpülÉ?ri Tor SÉ?yyahına É?lavÉ? et %s"
@@ -127,27 +142,27 @@ msgstr "Ä°ndi %s körpülÉ?ri Tor SÉ?yyahına É?lavÉ? et %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sS%sadÉ?cÉ? mÉ?nÉ? körpülÉ?ri ver!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "TÉ?kmillÉ?Å?dirilmiÅ? SeçimlÉ?r"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Xeyr"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sB%sÉ?li!"
@@ -155,69 +170,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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 mesajdır, lütfÉ?n cavab yazmayın.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Bu da körpülÉ?riniz:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB-É? xoÅ? gÉ?lkmisÉ?n!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Mövcud dÉ?stÉ?klÉ?nÉ?n nÉ?qliyyat NÃ?VlÉ?ri:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Salam, dost!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Bu email göy qurÅ?aÄ?ı, tÉ?buynuz vÉ? qıÄ?ılcımla hazırlanıb\n%s üçün %s tarixdÉ? vÉ? %s saatda."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,7 +211,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -240,7 +223,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -249,134 +232,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "KörpülÉ?r nÉ?dir?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "KörpülÉ?rin É?ldÉ? edilmÉ?sinin alternativ yollarını axtarıram!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
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".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 SÉ?yyahının versiyası vÉ? \nTor tÉ?rÉ?findÉ?n aldıÄ?ın hÉ?r hansı mesaj vÉ? s."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "SÉ?nin körpü sÉ?tirlÉ?rin:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Körpü Æ?ldÉ? Et!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Heç biri"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "LütfÉ?n, körpü növlÉ?ri üçün seçimlÉ?ri müÉ?yyÉ?nlÉ?Å?dir:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 ünvanlara ehtiyacın var?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "%s ehtiyacın var?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "SÉ?nin brauzerin Å?É?killÉ?ri göstÉ?rÉ? bilmir."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Yuxarıdakı Å?É?kildÉ?n iÅ?arÉ?lÉ?ri daxil et..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
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".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "KörpülÉ?ri Tor SÉ?yyahına É?lavÉ? etmÉ?k üçün ilk olaraq %s Tor SÉ?yyahını endirmÉ?\nsÉ?hifÉ?sinÉ? %s gedin vÉ? daha sonra endirib Tor SÉ?yyahını qurmaq üçün oradakı\naddımları izlÉ?yin."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Ä°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?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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É?."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Vanil körpü xahiÅ? et."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 körpü xahiÅ? et."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE-a görÉ? Pluggable Transport xahiÅ? et."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "BridgeDB-nin ictimai GnuPG açarının üzünü É?ldÉ? et."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po
index 6e94a94..c957a6c 100644
--- a/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/be/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Aleh Ladutska <lad-oleg@xxxxxxxxx>, 2014
# Ulad L, 2018-2019
+# Ð?аÑ?к Ð?еÑ?палевнÑ?й <hackcat.dev@xxxxxxxxx>, 2019
# StanislaÅ Silkin <moonblr29@xxxxxxxxx>, 2016
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-02 16:51+0000\n"
-"Last-Translator: Ulad L\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Belarusian (http://www.transifex.com/otf/torproject/language/be/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: be\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?Ñ?баÑ?айÑ?е! ШÑ?оÑ?Ñ?Ñ?Ñ? пайÑ?ло не Ñ?ак падÑ?аÑ? адпÑ?аÑ?кÑ? ваÑ?ага запÑ?Ñ?а."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?ова"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?аведамiÑ?Ñ? пÑ?а баг."
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?Ñ?Ñ?нÑ?Ñ?нÑ? код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?Ñ?Ñ?Ñ?оÑ?Ñ?Ñ? зменаÑ?"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "СÑ?вÑ?зÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ð?бÑ?аÑ?Ñ? УÑ?Ñ?"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ð?аказаÑ?Ñ? QR-код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+msgstr "QR-код длÑ? ваÑ?Ñ?Ñ? Ñ?Ñ?Ñ?ок з ваÑ?Ñ?мi маÑ?Ñ?амi"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ð?даеÑ?Ñ?а, адбÑ?лаÑ?Ñ? памÑ?лка падÑ?аÑ? аÑ?Ñ?Ñ?маннÑ? Ð?аÑ?ага QR-кода."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ð?а дадзенÑ? моманÑ? нÑ?ма даÑ?Ñ?Ñ?пнÑ?Ñ? маÑ?Ñ?оÑ?."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Ð?Ñ?ок %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "СпампÑ?йÑ?е %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Ð?Ñ?ок %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?Ñ?Ñ?Ñ?маÑ?Ñ? %s маÑ?Ñ?Ñ? %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Ð?Ñ?ок %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ЦÑ?пеÑ? %s дадайÑ?е маÑ?Ñ?Ñ? Ñ? Tor Browser %s"
@@ -128,27 +144,27 @@ msgstr "ЦÑ?пеÑ? %s дадайÑ?е маÑ?Ñ?Ñ? Ñ? Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sÐ?%sÑ?оÑ?Ñ?а дайÑ?е мне гÑ?Ñ?Ñ?Ñ? маÑ?Ñ?Ñ?!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Ð?адаÑ?ковÑ?Ñ? Ð?аладÑ?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ð?е"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "нÑ?ма"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sТ%sак!"
@@ -156,69 +172,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sÐ?%sÑ?Ñ?Ñ?маÑ?Ñ? Ð?аÑ?Ñ?Ñ?"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?Ñ?Ñ?а аÑ?Ñ?амаÑ?Ñ?Ñ?нае паведамленне; калÑ? лаÑ?ка, не адказвайÑ?е на Ñ?го.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ð?оÑ?Ñ? ваÑ?Ñ?Ñ? маÑ?Ñ?Ñ?:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Ð?Ñ? пеÑ?авÑ?Ñ?Ñ?лÑ? лÑ?мÑ?Ñ? Ñ?Ñ?Ñ?каÑ?Ñ?Ñ?. Ð?алÑ? лаÑ?ка, запаволÑ?нÑ?Ñ?еÑ?Ñ?! Ð?Ñ?нÑ?малÑ?нÑ? Ñ?аÑ? памÑ?ж\ne-mail %s гадзÑ?н. УÑ?е наÑ?Ñ?Ñ?пнÑ?Ñ? лÑ?Ñ?Ñ?Ñ? з Ñ?лекÑ?Ñ?оннай поÑ?Ñ?Ñ? Ñ?Ñ?гам гÑ?Ñ?ага Ñ?аÑ?Ñ? бÑ?дÑ?Ñ?Ñ? Ñ?гнаÑ?аваÑ?Ñ?а."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (аб'Ñ?днÑ?йÑ?е COMMANDs, каб пазнаÑ?Ñ?Ñ?Ñ? некалÑ?кÑ? ваÑ?Ñ?Ñ?нÑ?аÑ? аднаÑ?аÑ?ова)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "РадÑ? вÑ?Ñ?аÑ?Ñ? ваÑ? Ñ? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs, Ñ?Ñ?о заÑ?аз падÑ?Ñ?Ñ?млÑ?ваÑ?Ñ?Ñ?а:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?Ñ?Ñ?вÑ?Ñ?анне, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ñ?Ñ?аÑ?, Ñ?Ñ?бÑ?а!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð?Ñ?Ñ?Ñ? e-mail бÑ?Ñ? Ñ?Ñ?воÑ?анÑ? Ñ? аÑ?Ñ?амаÑ?Ñ?Ñ?на даÑ?ланÑ? Ñ?аÑ?оÑ?нÑ?мÑ? медзведзÑ?нÑ?Ñ?амÑ?, маленÑ?кÑ?мÑ? знÑ?Ñ?камÑ? Ñ? зÑ?Ñ?аÑ?лÑ?вÑ?мÑ? агенÑ?Ñ?Ñ?камÑ? длÑ? %s Ñ?(Ñ?) %s Ñ?(Ñ?) %s ."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +213,7 @@ msgid ""
msgstr "BridgeDB можа забÑ?Ñ?пеÑ?ваÑ?Ñ? маÑ?Ñ?Ñ? Ñ?ознÑ?мÑ? %sÑ?Ñ?памÑ? Pluggable Transports%s,\nÑ?Ñ?о могÑ?Ñ?Ñ? дапамагÑ?Ñ? Ñ?Ñ?аваÑ?Ñ? ваÑ?Ñ?Ñ? падлÑ?Ñ?Ñ?ннÑ? да Tor Network. Ð?лÑ? Ñ?Ñ?Ñ?, Ñ?Ñ?о назÑ?Ñ?ае за ваÑ?Ñ?м Ð?нÑ?Ñ?Ñ?нÑ?Ñ?-Ñ?Ñ?аÑ?Ñ?кам Ñ?Ñ?ановÑ?Ñ?Ñ?а болÑ?Ñ? Ñ?кладанÑ?м\nвÑ?знаÑ?Ñ?Ñ?Ñ?, Ñ?Ñ?о вÑ?\nкаÑ?Ñ?Ñ?Ñ?аеÑ?еÑ?Ñ? Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -241,7 +225,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +234,169 @@ msgid ""
"\n"
msgstr "ТакÑ?ама маÑ?Ñ?Ñ? BridgeDB маÑ?Ñ?Ñ? мноÑ?Ñ?ва Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? маÑ?Ñ?оÑ? %s, Ñ?кÑ?Ñ? не падÑ?Ñ?Ñ?моÑ?ваÑ?Ñ?Ñ? пеÑ?адаÑ?Ñ? дадзеннÑ?Ñ?\nPluggable Transports %s. Ð?Ñ?Ñ?а гÑ?Ñ?Ñ?Ñ?Ñ? не велÑ?мÑ? добÑ?а, Ñ? можа паÑ?плÑ?ваÑ?Ñ? на Ñ?ое, Ñ?к адлÑ?Ñ?Ñ?Ñ?оÑ?ваÑ?Ñ?Ñ?а Ñ?айÑ?Ñ?, аднак маÑ?Ñ?Ñ? Ñ?к Ñ? Ñ?аней,\nдапамагаÑ?Ñ?Ñ? абÑ?Ñ?одзÑ?Ñ?Ñ? Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?-Ñ?Ñ?нзÑ?Ñ?Ñ?.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ШÑ?о за маÑ?Ñ?Ñ??"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ð?аÑ?Ñ?Ñ? %s - гÑ?Ñ?а Ñ?Ñ?Ñ?Ñ?анÑ?лÑ?Ñ?аÑ?Ñ? Tor, Ñ?кÑ?Ñ? дапамогÑ?Ñ?Ñ? вам абмÑ?нÑ?Ñ?Ñ? Ñ?Ñ?нзÑ?Ñ?Ñ?."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?не Ñ?Ñ?Ñ?ба аÑ?Ñ?Ñ?маÑ?Ñ? маÑ?Ñ?Ñ? Ñ?к-небÑ?дзÑ? Ñ?Ñ?Ñ?Ñ?!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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. Ð?вÑ?Ñ?нÑ?Ñ?е Ñ?вагÑ?, Ñ?Ñ?о вÑ? мÑ?Ñ?Ñ?Ñ?е\nдаÑ?лаÑ?Ñ? лÑ?Ñ?Ñ? Ñ?олÑ?кÑ? з аднаго Ñ? наÑ?Ñ?Ñ?пнÑ?Ñ? e-mail Ñ?Ñ?вÑ?Ñ?аÑ?:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ð?ае маÑ?Ñ?Ñ? не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?! Ð?аÑ?Ñ?Ñ?бнаÑ? дапамога!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?алÑ? Ð?аÑ? Tor не пÑ?аÑ?Ñ?е, звÑ?Ñ?нÑ?Ñ?еÑ?Ñ? па e-mail адÑ?аÑ?е %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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. "
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ð?оÑ?Ñ? ваÑ?Ñ?Ñ? лÑ?нÑ?Ñ? маÑ?Ñ?оÑ?:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ð?Ñ?Ñ?Ñ?маÑ?Ñ? маÑ?Ñ?Ñ?!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?е"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ð?алÑ? лаÑ?ка, абÑ?Ñ?Ñ?Ñ?е наладÑ? длÑ? Ñ?Ñ?пÑ? маÑ?Ñ?а:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "ЦÑ? паÑ?Ñ?Ñ?бнÑ? вам IPv6 адÑ?аÑ?Ñ??"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "ЦÑ? паÑ?Ñ?Ñ?бнÑ? вам %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ? бÑ?аÑ?зÑ?Ñ? адлÑ?Ñ?Ñ?Ñ?оÑ?вае вÑ?Ñ?вÑ? некаÑ?Ñ?кÑ?на."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "УвÑ?дзÑ?Ñ?е Ñ?Ñ?мвалÑ? з вÑ?Ñ?вÑ?..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Як паÑ?аÑ?Ñ? каÑ?Ñ?Ñ?Ñ?аÑ?Ñ?а маÑ?Ñ?амÑ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Ð?аб дадаÑ?Ñ? новÑ? моÑ?Ñ? Ñ? бÑ?аÑ?зÑ?Ñ? Tor, Ñ?Ñ?Ñ?ба пеÑ?айÑ?Ñ?Ñ? на Ñ?Ñ?аÑ?онкÑ? Ñ?пампоÑ?ваннÑ? %s Tor Browser\n %s Ñ? Ñ?Ñ?Ñ?маÑ?Ñ?а Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?й па Ñ?Ñ?Ñ?алÑ?Ñ?Ñ?Ñ?\nбÑ?аÑ?зÑ?Ñ?а Tor."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?алÑ? вÑ?Ñ?какне даÑ?логавае вакенÑ?а \"СеÑ?кавÑ?Ñ? наладÑ? Tor\", наÑ?Ñ?Ñ?нÑ?Ñ?е \"Ð?аладзÑ?Ñ?Ñ?\" Ñ? кÑ?Ñ?Ñ?йÑ?еÑ?Ñ?\nпÑ?агÑ?амай Ñ?Ñ?Ñ?алÑ?Ñ?кÑ?, пакÑ?лÑ? Ñ?на не Ñ?пÑ?Ñ?ае:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "ЦÑ? блакÑ?е ваÑ? Ñ?нÑ?Ñ?Ñ?нÑ?Ñ?-пÑ?авайдÑ?Ñ? злÑ?Ñ?Ñ?нне з Ñ?еÑ?кай Tor, алÑ?бо Ñ?к-небÑ?дзÑ?\nпа-Ñ?нÑ?амÑ? Ñ?Ñ?нзÑ?Ñ?Ñ?Ñ?Ñ?е Ñ?го?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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\" каб аÑ?Ñ?Ñ?маÑ?Ñ? падÑ?Ñ?Ñ?мкÑ?."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?аÑ?лаÑ?Ñ? запÑ?Ñ? на Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? маÑ?Ñ?Ñ?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?апÑ?Ñ?аÑ?Ñ? маÑ?Ñ?Ñ? IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?аÑ?лаÑ?Ñ? запÑ?Ñ? на Pluggable Transport ад TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Ð?Ñ?Ñ?Ñ?майÑ?е копÑ?Ñ? пÑ?блÑ?Ñ?нага GnuPG-клÑ?Ñ?а BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
index 9a0d45a..3b60af7 100644
--- a/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/bg/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# aramaic <aramaicbg@xxxxxxxxx>, 2015
@@ -11,116 +11,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: bg\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "СÑ?жалÑ?ваме! Ð?еÑ?о Ñ?е обÑ?Ñ?ка Ñ? заÑ?вкаÑ?а ви."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?зик"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?окладвай пÑ?облем"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "СоÑ?Ñ? код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?невник на пÑ?омениÑ?е"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?онÑ?акÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ð?збeÑ?и вÑ?иÑ?ко"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ð?окажи QR Ð?од"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ð?зглежда е имало гÑ?еÑ?ка пÑ?и полÑ?Ñ?аване на ваÑ?иÑ? QR Ð?од."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ð? моменÑ?а нÑ?ма налиÑ?ни bridges ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "СÑ?Ñ?пка %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Свали %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "СÑ?Ñ?пка %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?земи %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "СÑ?Ñ?пка %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Сега %sдобавеÑ?е bridges кÑ?м Tor Browser %s"
@@ -129,27 +144,27 @@ msgstr "Сега %sдобавеÑ?е bridges кÑ?м Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sÐ?%sÑ?оÑ?Ñ?о ми дайÑ?е bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "РазÑ?иÑ?ени вÑ?зможноÑ?Ñ?и"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ð?е"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ниÑ?о"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sÐ?%sа!"
@@ -157,69 +172,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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 "[Ð?вÑ?омаÑ?иÑ?но Ñ?Ñ?обÑ?ение; молÑ? не оÑ?говаÑ?Ñ?йÑ?е.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Това Ñ?а ваÑ?иÑ?е мÑ?ежови bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 Ñ?аÑ?а. Ð?Ñ?иÑ?ки Ñ?ледваÑ?и е-поÑ?и по вÑ?еме на Ñ?ози пеÑ?иод Ñ?е бÑ?даÑ? анÑ?лиÑ?ани."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (комбиниÑ?ай COMMANDs за да опÑ?еделиÑ? мÑ?лÑ?и опÑ?ии едновÑ?еменно)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?обÑ?е доÑ?ли в BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ð?кÑ?Ñ?ални поддÑ?Ñ?жани Ñ?Ñ?анÑ?поÑ?Ñ? TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Хей, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?дÑ?авей, пÑ?иÑ?Ñ?ел!"
-
-#: 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."
-#: 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."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +213,7 @@ msgid ""
msgstr "BridgeDB може да пÑ?едложи bridges Ñ? много %sвидове на Pluggable Transports%s,\nкоиÑ?о могаÑ? да помогнаÑ? да подÑ?игÑ?Ñ?Ñ?Ñ? ваÑ?аÑ?а вÑ?Ñ?зка кÑ?м Tor Network, пÑ?авейки Ñ? по\nÑ?Ñ?Ñ?дна за наблÑ?дение за вÑ?еки наблÑ?даваÑ? ваÑ?иÑ? инÑ?еÑ?неÑ? Ñ?Ñ?аÑ?ик да оÑ?кÑ?ие Ñ?е ползваÑ?е Tor\n \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -242,7 +225,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +234,169 @@ msgid ""
"\n"
msgstr "Ð?опÑ?лниÑ?елно, BridgeDB има много plain-ol'-vanilla bridges %s без никакви\nPluggable Transports %s коиÑ?о не изглеждаÑ? Ñ?олкова добÑ?е, но вÑ?е пак могаÑ?\nда помогнаÑ? за заобикалÑ?не на инÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?аÑ?а в много Ñ?лÑ?Ñ?аи.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ð?акво Ñ?а bridges?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s Ñ?а Tor relays коиÑ?о помагаÑ? за заобикалÑ?не на Ñ?ензÑ?Ñ?аÑ?а."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?мам нÑ?жда оÑ? алÑ?еÑ?наÑ?ивен ваÑ?ианÑ? за намиÑ?ане на bridges!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Ð?Ñ?Ñ?г ваÑ?ианÑ? за набавÑ?не на bridges е пÑ?аÑ?ане на е-поÑ?а до %s. Ð?олÑ? оÑ?бележеÑ?е, Ñ?е вие Ñ?Ñ?Ñ?бва да\nизпÑ?аÑ?иÑ?е е-поÑ?а използвайки адÑ?еÑ? на един оÑ? Ñ?ледниÑ?е доÑ?Ñ?авÑ?иÑ?и:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ð?оиÑ?е bridges не Ñ?абоÑ?Ñ?Ñ?! Ð?мам нÑ?жда оÑ? помоÑ?!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ко ваÑ?иÑ? Tor не Ñ?абоÑ?и, изпÑ?аÑ?еÑ?е е-поÑ?а до %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 е оÑ?говоÑ?ил, и Ñ?.н."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "ТÑ?Ñ? Ñ?а ваÑ?иÑ?е bridge вÑ?Ñ?зки:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ð?земеÑ?е Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?иÑ?о"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ð?олÑ? избеÑ?еÑ?е опÑ?иÑ? за вид bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ð?Ñ?ждаеÑ?е ли Ñ?е оÑ? IPv6 адÑ?еÑ?и?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?Ñ?здаеÑ?е ли Ñ?е оÑ? %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ?иÑ? бÑ?аÑ?зеÑ? не показва пÑ?авилно изобÑ?ажениÑ?."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Ð?Ñ?ведеÑ?е Ñ?имволиÑ?е оÑ? изобÑ?ажениеÑ?о оÑ? гоÑ?е..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ð?ак да запоÑ?неÑ?е да използваÑ?е ваÑ?иÑ?е bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Ð?а вÑ?веждане на bridges в Tor Browser, пÑ?Ñ?во оÑ?идеÑ?е на \n%s Tor Browser Ñ?еб Ñ?Ñ?Ñ?аниÑ?аÑ?а за Ñ?валÑ?не %s и Ñ?лед Ñ?ова \nÑ?ледвайÑ?е инÑ?Ñ?Ñ?Ñ?кÑ?ииÑ?е Ñ?ам за Ñ?валÑ?не и Ñ?Ñ?аÑ?Ñ?иÑ?ане на \nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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Ñ?Ñ?веÑ?ника докаÑ?о не попиÑ?а:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "ЦензÑ?Ñ?иÑ?а ли или блокиÑ?а вÑ?Ñ?зкаÑ?а ви ваÑ?иÑ? Ð?нÑ?еÑ?неÑ? доÑ?Ñ?авÑ?ик (ISP)\nдо Tor мÑ?ежаÑ?а?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?збеÑ?еÑ?е 'Ð?а' и Ñ?лед Ñ?ова кликнеÑ?е 'Ð?апÑ?ед'. Ð?а да конÑ?игÑ?Ñ?иÑ?аÑ?е ваÑ?иÑ?е нови bridges, копиÑ?айÑ?е и\nпоÑ?Ñ?авеÑ?е bridge Ñ?едовеÑ?е в пÑ?озоÑ?еÑ?а за Ñ?екÑ?Ñ?ово вÑ?веждане. Ð?а кÑ?аÑ? наÑ?иÑ?неÑ?е 'СвÑ?Ñ?жи Ñ?е', и\nÑ?Ñ?Ñ?бва да Ñ?Ñ?е гоÑ?ови! Ð?ко Ñ?Ñ?еÑ?аÑ?е Ñ?Ñ?Ñ?дноÑ?Ñ?и, оÑ?идеÑ?е на 'Ð?омоÑ?' бÑ?Ñ?она в 'Tor Network Settings' Ñ?Ñ?веÑ?ника за помоÑ?."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?аÑ?ви Ñ?Ñ?андаÑ?Ñ?ни bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?аÑ?ви IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?аÑ?ви Pluggable Transport Ñ?поÑ?ед TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Ð?земи копие на BridgeDB's обÑ?еÑ?Ñ?вен GnuPG клÑ?Ñ?."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po
index 1cdc028..9da826f 100644
--- a/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/bn/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,9 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
+# Al Shahrior Hasan Sagor <shahrior3814@xxxxxxxxx>, 2019
# code smite <codesmite@xxxxxxxxx>, 2018
# Humayun Rashid <reporterhr@xxxxxxxxx>, 2019
# Mahmud Numan <mahmudnuman@xxxxxxxxx>, 2016-2017
@@ -14,116 +14,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-06-25 11:00+0000\n"
-"Last-Translator: Tasneem Khalil <tasneem.khalil@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Bengali (http://www.transifex.com/otf/torproject/language/bn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: bn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "দà§?à¦?à¦?িত! à¦?পনার à¦?নà§?রà§?ধà§? à¦?িà¦?à§? à¦à§?ল হয়à§?à¦?à§?।"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¦à¦¾à¦·à¦¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "���ি ত�র��ি রিপ�র�� �র�ন"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "স�র�স ��ড"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "পরিবর�তন�র তালি�া"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "য��ায��"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "সব নির�বা�ন �র�ন"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR ��ড দ���ন"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "মনà§? হà¦?à§?à¦?à§? à¦?পনার â??QR à¦?à§?ড পà§?তà§? à¦?à§?থাà¦? à¦?ামà§?লা হà§?à§?à¦?à§?"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "বরà§?তমানà§? à¦?à§?ন সà§?à¦?যà§?à¦?à§?তি লাà¦?ন সহà¦?লà¦à§?য নà§?à¦?..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ধাপ %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ডা�নল�ড %s �র ব�রা��ার %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ধাপ %s 2 %s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "��� %s ব�রি� %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "ধাপ %s 3 %s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "��ন %s �র ব�রা��ার� ব�রি� য���ত �র�ন%s"
@@ -132,27 +147,27 @@ msgstr "��ন %s �র ব�রা��ার� ব�রি� য�
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ %s �মা�� শ�ধ� ব�রি� দা�!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "�ন�নত বি�ল�প"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "না"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "��ন��া না"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%s %s হ�যা�"
@@ -160,69 +175,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%s ��� ব�রি�"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[��ি ���ি স�বয়���রিয় বার�তা; দয়া �র� প�রত�য�ত�তর দ�ব�ন না ।] "
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "��ান� �পনার ব�রি���লি:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 �ন��া। �� সময়�র মধ�য� �র� �ন�যান�য �ম�ল �প���ষা �রা হব�।"
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (��য��� ��াধি� বি�ল�প �ল�ল�� �রত� COMMANDs ��ত�রিত �র�ন)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB ত� স�বা�তম!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "বর�তমান� সমর�থিত পরিবহন প�র�ার:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "�র�, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "�হ� বন�ধ�!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "�� �ম�ল�ি rainbows, unicorns, �ব� sparkles দিয়� ত�রি �রা হয়��িল\n%s. ত� %s %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -233,7 +216,7 @@ msgid ""
msgstr "BridgeDB বিà¦à¦¿à¦¨à§?ন %s ধরনà§?র পà§?লà§?যাà¦?à§?বল à¦?à§?রানà§?সপà§?রà§?à¦? %s সà¦?à§?à¦?à§? বà§?রিà¦? পà§?রদান à¦?রতà§? পারà§?ন,\nযা à¦?র নà§?à¦?à¦?য়ারà§?à¦?à¦?à§? à¦?পনার সà¦?যà§?à¦?à¦?à§?লি à¦?পà§?রতিরà§?ধà§?য à¦?রতà§? সহায়তা à¦?রà§?, à¦?à¦?ি à¦?রà¦? বà§?শি à¦?রà§? তà§?রি à¦?রà§?\nযà§? à¦?à§?à¦? à¦?পনার à¦?নà§?à¦?ারনà§?à¦? à¦?à§?রà§?যাফিà¦?à¦?ি দà§?à¦?à§? à¦?পনার পà¦?à§?ষà§? তা নিরà§?ধারণ à¦?রা à¦?ঠিন\nà¦?র বà§?যবহার à¦?রà§?\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -245,7 +228,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -254,134 +237,169 @@ msgid ""
"\n"
msgstr "à¦?পরনà§?তà§?, বà§?রিà¦?ডিবি à¦?র মধà§?যà§? পà§?রà¦?à§?র পà§?লà§?à¦?ন-à¦à§?যালি-à¦à§?যানিলা বà§?রিà¦? %s রয়à§?à¦?à§?\nপà§?লà§?যাà¦?à§?বল à¦?à§?রানà§?সপà§?রà§?à¦? %s যা হয়তà§? ঠানà§?ডা বলà§? মনà§? à¦?রà§? না, তবà§? তারা à¦?à¦?নà¦? à¦?রতà§? পারà§?\nà¦?নà§?à¦? à¦?à§?ষà§?তà§?রà§? à¦?নà§?à¦?ারনà§?à¦? সà§?নà§?সরশিপà¦?à§? বাধা দিতà§? সাহাযà§?য\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ব�রি� �ি ?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s ব�রি��স %s �র রিল� যা �পনা�� স�ন�সরশিপ�� বাধা দি����।"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "ব�রি��র ব�যবস�থা �রার ���া বি�ল�প �পায় দর�ার!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 থ��� ���ি �ম�ল পাঠান�। দয়া �র� মন� রা�ব�ন য� �পনা�� �বশ�য�\nনিম�ন���ত �ম�ল প�রদান�ার�দ�র মধ�য� ���ি ঠি�ানা ব�যবহার �র� �ম�ল পাঠাত� হব�: %s\n, %s বা %s।"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "�মার ব�রি� �া� �র�� না! �মার সাহায�য দর�ার!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "যদি �পনার Tor �া� না �র�, তব� �পনার �ম��ল �রা ��ি� %s।"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "তালিà¦?াà¦?ি সহ à¦?পনার à¦?à§?স হিসাবà§? যতà¦?া তথà§?য à¦?নà§?তরà§?à¦à§?à¦?à§?ত à¦?রার à¦?à§?ষà§?à¦?া à¦?রà§?ন,\nসà§?তà§? à¦?বà¦? পà§?লà§?যাà¦?à§?বল à¦?à§?রানà§?সফরà§?মà¦?à§?লি à¦?পনি বà§?যবহার à¦?রার à¦?à§?ষà§?à¦?া à¦?রà§?à¦?à§?ন, à¦?পনার à¦?র বà§?রাà¦?à¦?ারà§?র সà¦?সà§?à¦?রণ,\nà¦?বà¦? à¦?র দিয়à§?à¦?à§?ন à¦?মন à¦?à§?ন বারà§?তা à¦?তà§?যাদি।"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "যদি �পনার Tor Browser স�য�� না হল�, দয়া �র� %s�ব� �মাদ�র %s� ��বার দ���ন।"
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "��ান� �পনার ব�রি���লি:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "��� ব�রি�"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "��ন�ি না"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "ব�রি� �া�প �র �ন�য বি�ল�প নির�বা�ন �র�ন:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "�পনার �ি IPv6 ঠি�ানা প�রয়��ন?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "�পনি �ি ���ি %s প�রয়��ন?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "à¦?পনার বà§?রাà¦?à¦?ার সঠিà¦?à¦à¦¾à¦¬à§? à¦?মà§?à¦? পà§?রদরà§?শন à¦?রা হয় না।"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "�পর�র �িত�র থ��� ���ষর ��লি লি��ন ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "à¦?িà¦à¦¾à¦¬à§? বà§?রিà¦? বà§?যবহার শà§?রà§? à¦?রবà§?ন"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "�র ব�রা��ার� ব�রি� প�রব�শ �রত�, প�রথম� %s �র ব�রা��ার ডা�নল�ড �র�ন\nপ�ষ�ঠা %s �ব� তারপর ডা�নল�ড �ব� শ�র� �রার �ন�য স��ান� নির�দ�শাবল� �ন�সরণ �র�ন\n�র ব�রা��ার"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "য�ন '�র ন���য়ার�� স��ি�স' স�লাপ পপ �প, '�নফি�ার' ��লি� �র�ন �ব� �ন�সরণ �র�ন\n���ার�ড যত��ষণ না �ি���াসা �র�:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "à¦?পনার à¦?নà§?à¦?ারনà§?à¦? সারà§?à¦à¦¿à¦¸ পà§?রà§?à¦à¦¾à¦?ডার (à¦?à¦?à¦?সপি) বà§?লà¦? বা à¦?নà§?যথায় সà¦?যà§?à¦? সà§?নà§?সর à¦?রà§? না\nà¦?র নà§?à¦?à¦?য়ারà§?à¦? থà§?à¦?à§??"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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à¦?রà¦? সহায়তা à¦?নà§?য 'à¦?র নà§?à¦?à¦?য়ারà§?à¦? সà§?à¦?িà¦?স' à¦?à¦?à¦?ারà§?ড মধà§?যà§? বাà¦?ন"
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "à¦à§?যানিলা বà§?রà§?à¦?সমà§?হà§?র à¦?নà§?রà§?ধ à¦?রà§?ন"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 ব�রি��র �ন�র�ধ �র�ন"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE দ�বারা প�ল�যা��বল ��রান�সপ�র���র �ন�র�ধ �র�ন"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "BridgeDB �র সার�ব�ন�ন GnuPG ��-��র ���ি �ন�লিপি পান।"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..2aee18d
--- /dev/null
+++ b/bridgedb/i18n/bs/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Amar Memisevic <factoryamar@xxxxxxxxx>, 2019-2020
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 2.8.0\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"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Izvini! Nešto je pošlo po zlu sa vašim zahtevom."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Prijavi grešku"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Izvorni kod"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Promjene"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "OznaÄ?i sve"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Prikaži QR kod"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kod za vaÅ¡u briÄ? liniju"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Ä?ini se da je doÅ¡lo do pogreÅ¡ke prilikom dostavljanja vaÅ¡eg QRCode."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Ovaj QRCode sadrži linije briÄ?a. Skenirajte ga QRCode Ä?itaÄ?em kako biste kopirali svoje briÄ?eve linije na mobilne i druge ureÄ?aje."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Trenutno nema dostupnih briÄ?eva ..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Možda biste trebali pokušati %s vratiti se %s i odabrati drugu vrstu mosta!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Korak %s 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Preuzmi %s Tor PretraživaÄ? %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Korak %s2%s "
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Uzmi %s briÄ? %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "Korak %s3%s "
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sada %s dodajte briÄ?eve Tor pretraživaÄ?u %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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sS%samo mi daj briÄ?eve!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Napredne Opcije"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Ništa"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sDa%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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sU%szmi BriÄ?eve"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Evo vaÅ¡ih briÄ?eva:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "PrekoraÄ?ili ste ograniÄ?enje stope. Molimo vas usporite! Minimalno vrijeme izmeÄ?u\ne-mailovi su %s sati. Sva daljnja e-poÅ¡ta u ovom vremenskom periodu bit Ä?e zanemarena."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB može pružiti mostove s nekoliko%svrsta Pluggable transport'a%s,\nÅ¡to može pomoÄ?i zamagli vaÅ¡e veze sa Tor mreže, Å¡to je viÅ¡e\nsvima koji gledaju vaÅ¡ internetski promet teÅ¡ko je utvrditi kakvi ste\nkoristeÄ?i Tor.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Dostupni su i neki briÄ?evi s IPv6 adresama, iako su neki Modularni\nTranspori nisu IPV6 kompatibilni.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Å ta su Mostovi ?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ništa"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
index f169b0e..5d29542 100644
--- a/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ca/LC_MESSAGES/bridgedb.po
@@ -1,158 +1,175 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Albert <provisionalib@xxxxxxxxxxx>, 2013
-# Assumpta <assumptaanglada@xxxxxxxxx>, 2014
+# Assumpta, 2014
+# Benny Beat <bennybeat@xxxxxxxxx>, 2019-2020
# Eloi GarcÃa i Fargas, 2014
# Humbert, 2014
# isis <isis@xxxxxxxxxxxxxx>, 2015
+# jmontane, 2019-2020
# laia_, 2014-2015
# Toni Hermoso Pulido <toniher@xxxxxxxxxxxxxx>, 2012
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ca\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Quelcom ha anat malament amb la petició."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Llengua"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Comunica un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Codi font"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registre de canvis"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacte"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecciona-ho tot"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostra el codi QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
-msgstr "Hi ha hagut un error en obtenir el codi QR"
+msgstr "S'ha produït un error en obtenir el codi QR"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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. "
+msgstr "Aquest codi QR conté les lÃnies de pont. Escanegeu-lo amb un lector de codis QR per a copiar les lÃnies de pont al mòbil i a altres dispositius. "
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
-msgstr "No hi ha ponts disponibles en aquests moments."
+msgstr "No hi ha cap pont disponible en aquests moments."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Pas %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
-msgstr "Descarrega %s Navegador Tor %s"
+msgstr "Baixeu el %s navegador Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Pas %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
-msgstr "Descarrega %s ponts %s"
+msgstr "Baixeu els %s ponts %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Pas %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ara %s adjunta els ponts al Tor Browser %s"
+msgstr "Ara %s adjunteu els ponts al 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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust donem els meus bridges!"
+msgstr "%sN%somés dóna'm els ponts!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
-msgstr "Opcions Avançades"
+msgstr "Opcions avançades"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sÃ!"
@@ -160,69 +177,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
-msgstr "%sD%sescarrega Bridges"
+msgstr "%sB%saixa els ponts"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Aquest és un missatge automà tic, no el respongui.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Els vostres ponts: "
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
+msgstr "Heu superat el lÃmit. El mÃnim de temps entre\nels correus és de %s hores. S'ingorarà a resta de correus durant aquest perÃode de temps."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina COMMANDs per especificar diverses opcions simultà niament)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Benvingut a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Actualment suportant transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hola, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hola, amic!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Aquest correu va ser creat amb unicorns, arcs de Sant Martà i espurnes\nper a %s el %s a les %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,158 +215,193 @@ 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 "El BridgeDB pot proveir ponts entre diversos %stipus de transports extensibles%s, que poden ajudar a ofuscar la vostra connexió en la xarxa\nTor, fent més difÃcil de determinar que esteu usant Tor a qualsevol\nque vegi el vostre trà nsit de connexió a internet.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns Pluggable\nTransports no són compatibles amb IPv6.\n\n"
+msgstr "També hi ha ponts disponibles amb adreces IPv6, tot i que alguns transports extensibles no són compatibles amb IPv6.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "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"
+msgstr "A més a més, el BridgeDB té molts ponts %s està ndard sense \ntransports extensibles%s, que potser no són tan interessants, però que també\npoden ajudar a esquivar la censura d'internet en molts casos.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Què són els ponts?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
+msgstr "Els %s ponts %s són repetidors Tor que ajuden a esquivar la censura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
-msgstr "Em cal una manera alternativa d'obtenir ponts."
+msgstr "Em cal una manera alternativa per a obtenir ponts."
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Una altra forma d'obtenir ponts és enviar un correu electrònic a %s. Deixeu l'assumpte del correu en blanc i escriviu «get transport obfs4» en el cos del missatge del correu. Tingueu en compte que cal que envieu el missatge fent servir una adreça d'algun dels proveïdors de correu següents: %s o %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
-msgstr "No em funcionen els ponts! Ajuda!"
-
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no us funciona, envieu un correu a %s."
+msgstr "No em funcionen els ponts; necessito ajuda!"
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si el navegador Tor no pot connectar, doneu una ullada al %s i al %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Les vostres lÃnies de ponts:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
-msgstr "Descarregueu ponts!"
+msgstr "Baixa els ponts!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Sistemes de distribució de ponts"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementa quatre sistemes per a distribuir ponts: «HTTPS», «Moat», «Correu electrònic» i «Reservat». Els ponts que no es distribueixen per BridgeDB usen el pseudomecanisme «Cap». La llista següent explia breumetn com funcionen aquests mecanismes i les %smètriques de BridgeDB%s mostren la popularitat de cadascun d'aquests mecanismes."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "El sistema de distribució «HTTPS» deixa els ponts en mans d'aquest lloc web. Per a obtenir ponts, aneu a %sbridges.torproject.org%s, seleccioneu les opcions preferents i resolgueu el CAPTCHA corresponent."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Els usuaris poden sol·licitar ponts des del sistema de distribució «Correu electrònic» enviant un correu a %sbridges@xxxxxxxxxxxxxx%s i escrivint «get transport obfs4» en el cos del missatge."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservat"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB manté un petit nombre de ponts que no es distribueixen automà ticament. En comptes d'això, reservem aquests ponts per a distribuir-los manualment a ONG i altres organitzacions i persones que necessiten ponts. Els ponts que es distribueixen via el sistema «Reservat» potser no veuen usuar per força temps. Tingueu en compte que el sistema de distribució «Reservat» s'anomena «Unallocated» en els fitxers d'%sassignació de ponts disponibles%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Cap"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Seleccioneu les opcions pel tipus de pont:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
-msgstr "Necessiteu adreces IPv6?"
+msgstr "Us calen adreces IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
-msgstr "Necessiteu un %s?"
+msgstr "Us cal un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "El navegador no està mostrant les imatges correctament."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Introduïu els carà cters de la imatge superior..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Com començar a utilitzar els ponts"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "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. "
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "El vostre Proveïdor d'Internet (ISP) bloqueja o censura les connexions\namb la xarxa Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Demanar ponts està ndard."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Demanar ponts IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Demanar un Pluggable Transport per TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Descarregar una còpia de la clau pública GnuPG del BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
index 9a0e93e..3ef1411 100644
--- a/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/cs/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,17 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# A5h8d0wf0x <littleslyfoxie28@xxxxxxxxx>, 2014
# Adam Slovacek <adamslovacek@xxxxxxxxx>, 2013
+# David Stepan <stepand@xxxxxxxxxx>, 2019
# Elisa <valhalla@xxxxxxxxxxxxx>, 2011
# Filip Hruska <fhr@xxxxxxxxx>, 2015
# Sanky <gsanky+transifex@xxxxxxxxx>, 2011
# JiÅ?Ã VÃrava <appukonrad@xxxxxxxxx>, 2014
-# Michal Stanke <mstanke@xxxxxxxxxx>, 2018
+# Michal Stanke <mstanke@xxxxxxxxxx>, 2018-2019
+# Mikuláš Vrba <mikulasvrba@xxxxxxxxx>, 2020
# mxsedlacek, 2014
# Radek Bensch <inactive+Radog@xxxxxxxxxxxxx>, 2013
# Tomas Palik, 2015
@@ -18,116 +20,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-10-25 18:02+0000\n"
-"Last-Translator: Michal Stanke <mstanke@xxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: cs\n"
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n >= 2 && n <= 4 && n % 1 == 0) ? 1: (n % 1 != 0 ) ? 2 : 3;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "PromiÅ?te. Váš požadavek se nepodaÅ?ilo provést."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jazyk"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Nahlásit chybu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Zdrojový kód"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Seznam zmÄ?n"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "OznaÄ?it vÅ¡e"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Zobrazit QR kód"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "PÅ?i zpracovánà vaÅ¡eho QR kódu zÅ?ejmÄ? nastala chyba."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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. Pro zkopÃrovánà na mobilnà nebo jiná zaÅ?Ãzenà naskenujte QR kód Ä?teÄ?kou."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Nynà nejsou k dispozici žádné mosty..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Krok %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Stáhnout %sprohlÞeÄ? Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Krok %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "ZÃskat %s mosty %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Krok %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nynà %s pÅ?idejte mosty do prohlÞeÄ?e Tor %s"
@@ -136,27 +153,27 @@ msgstr "Nynà %s pÅ?idejte mosty do prohlÞeÄ?e Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sen mi dejte mosty!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "RozÅ¡ÃÅ?ená nastavenÃ"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sA%sno!"
@@ -164,69 +181,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sN%sastavit mosty"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Toto je automatická zpráva. NeodpovÃdejte na ni prosÃm.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Toto je automatický email.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Zde jsou vaše mosty:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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Ä?ili jste limit poÄ?tu požadavků. Zpomalte prosÃm. Minimálnà Ä?as mezi e-maily je %s hodin. VÅ¡echny následujÃcà e-maily bÄ?hem této Ä?asové doby budou ignorovány."
-#: 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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "VÃtejte v BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "V souÄ?asnosti podporované transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ahoj, pÅ?Ãteli!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Tento duhový e-mail plný jednorožců a hvÄ?zd byl generován pro %s dne %s v %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -237,7 +222,7 @@ msgid ""
msgstr "BridgeDB může nabÃdnou mosty s nÄ?kolika %s typy Pluggable Transports%s,\ncož může zamaskovat vaÅ¡e pÅ?ipojenà k sÃti Tor a znesnadnit pro kohokoli\nsledovat vaÅ¡i internetovou aktivitu a urÄ?it, zda Tor použÃváte\nnebo nikoliv.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -249,7 +234,7 @@ msgstr "K dispozici jsou také nÄ?které mosty s IPv6 adresami, 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -258,134 +243,169 @@ msgid ""
"\n"
msgstr "BridgeDB má také spoustu obyÄ?ejných mostů %s bez žádných \nPluggable Transports %s. To sice nemusà znÃt tak super, ale poÅ?ád vám mohou v mnoha pÅ?Ãpadech\npomoci obejÃt internetovou cenzuru.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Co jsou to mosty?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Mosty %s jsou uzly Toru, které vám pomáhajà obejÃt cenzuru."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "PotÅ?ebuji jiný způsob jak zÃskat most!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "DalÅ¡Ã způsob, jak zÃskat mosty, je poslat e-mail na %s. MÄ?jte prosÃm na pamÄ?ti, že musÃte poslat e-mail pouze ze schránky následujÃcÃch poskytovatelů e-mailových služeb:\n%s, %s nebo %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Mé mosty nefungujÃ. PotÅ?ebuji pomoc!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Pokud vám Tor nefunguje, pošlete nám e-mail na %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "NapiÅ¡te nám co nejvÃce o vaÅ¡em problému, vÄ?etnÄ? seznamu\nmostů a pluggable Transports, které jste se pokusili použÃt, vaÅ¡i verzi prohlÞeÄ?e Tor,\nvÅ¡echny zprávy, které jste od Toru zÃskali, atd."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Pokud se váš ProhlÞeÄ? Tor nemůže pÅ?ipojit, pÅ?eÄ?tÄ?te si %s a %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Zde jsou vaše linky k mostům: "
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "ZÃskat mosty!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Rezervováno"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Žádné"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Vyberte úrosÃm nastavenà pro typ mostu:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "PotÅ?ebujete IPv6 adresu?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "PotÅ?ebujete %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Váš prohlÞeÄ? nezobrazuje správnÄ? obrázky."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Zadejte pÃsmena z obrázku výše..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Jak zaÄ?Ãt použÃvat mosty."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "K vloženà mostů do prohlÞeÄ?e Tor, postupujte podle instrukcà ke staženà a spuÅ¡tÄ?nà na %s stránce\nke staženà prohlÞeÄ?e Tor %s."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Když vyskoÄ?à 'Nastavenà sÃtÄ? Tor', klepnÄ?te na 'Konfigurovat' a postupujte\npodle průvodce, dokud se nezeptá:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Blokuje nebo jinak cenzuruje váš poskytovatel internetového pÅ?ipojenà (ISP) spojenà se sÃtà Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Vyberte 'Ano' a poté kliknÄ?te 'DalÅ¡Ã'. Pro nastavenà nových mostů zkopÃrujte a\nvložte linky k mostům do textového pole. Nakonec kliknÄ?te na 'PÅ?ipojit' a\nto by už mÄ?lo být vÅ¡echno. Pokud narazÃte na problémy, zkuste kliknout na tlaÄ?Ãtko 'Pomoc'\nv dialogu průvodce 'Nastavenà sÃtÄ? Tor'."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Požádat o obyÄ?ejné mosty."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Požádat o IPv6 mosty."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Požádat o Pluggable Transport s TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "ZÃskat kopii veÅ?ejného GnuPG klÃÄ?e BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
index 403498e..0f2df21 100644
--- a/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/da/LC_MESSAGES/bridgedb.po
@@ -1,14 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Christian Villum <villum@xxxxxxxxxxx>, 2014-2015
# David Nielsen <gnomeuser@xxxxxxxxx>, 2014
# Mogelbjerg <jan@xxxxxxxxxxxxx>, 2015
# Lasse Møller <hal9k@xxxxxxxxxx>, 2016
-# scootergrisen, 2017-2019
+# scootergrisen, 2017-2020
# OliverMller <theoliver@xxxxxxxxxx>, 2011
# Thomas Pryds <thomas@xxxxxxxx>, 2014
# Tore Bjørnson <tore.bjornson@xxxxxxxxx>, 2013
@@ -16,145 +15,160 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-06-21 06:01+0000\n"
-"Last-Translator: scootergrisen\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: da\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
-msgstr "Beklager. Noget gik galt med din anmodning."
+msgstr "Beklager! Noget gik galt med din anmodning."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Sprog"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapportér en fejl"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kildekode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ã?ndringslog"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
-msgstr "Marker alle"
+msgstr "Markér alt"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
-msgstr "Vis QRCode"
+msgstr "Vis QR-kode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
-msgstr "QRCode for dine brolinjer"
-
-#. 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, vi står i lort til halsen!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "QR-kode til dine brolinjer"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
-msgstr "Det lader til at der opstod en fejl ved hentningen af din QRCode."
+msgstr "Der lader til at være opstået en fejl ved hentning af din QR-kode."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
-msgstr "Denne QRCode indeholder dine brolinjer. Scan den med en QRCode-læser for at kopiere dine brolinjer over til mobile og andre enheder."
+msgstr "QR-koden indeholder dine brolinjer. Skan den med en QR-kodelæser for at kopiere dine brolinjer til mobiltelefon og andre enheder."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Der er i øjeblikket ingen tilgængelige broer..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
-msgstr " Du kunne måse prøve %s at gå tilbage %s og vælge en anden brotype!"
+msgstr " Du kunne måske prøve %s tilbage til %s og vælge en anden brotype!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Trin %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Trin %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
-msgstr "FÃ¥ %s broer %s"
+msgstr "Hent %s broer %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Trin %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "%s Tilføj broer til Tor Browser %s"
+msgstr "%s Tilføj nu broerne til 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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%sare giv mig broer!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
-msgstr "Avancerede indstillinger"
+msgstr "Avancerede valgmuligheder"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nej"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ingen"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -162,69 +176,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sent broer"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er en automatisk meddelelse; Svar venligst ikke.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dette er en automatiseret e-mail.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Her er dine broer:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Du har overskredet ratebegrænsningen. Sænk venligst hastigheden! Den minimale tid mellem\ne-mails er %s timer. Yderligere e-mails sendt i denne periode vil blive ignoreret."
+msgstr "Du har overskredet hastighedsgrænsen. Sæt venligst hastigheden ned! Den laveste tid mellem\ne-mails er %s timer. Yderligere e-mails sendt i perioden vil blive ignoreret."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (kombiner COMMANDs for at angive flere valgmuligheder samtidigt)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkommen til BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPE'er som er understøttet i øjeblikket:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hej min ven!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Offentlige nøgler"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Denne e-mail til %s blev skabt ved hjælp af regnbuer,\nenhjørninger og glitter %s klokken %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Hvis broerne ikke er dem du har brug for, så besvar e-mailen med en af\nfølgende kommandoer i meddelelseskroppen:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,158 +214,193 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB kan formidle broer med adskillige typer %sUdskiftelige transporter%s\nsom kan hjælpe med at sløre dine forbindelser til Tor-netværket, og dermed\ngøre det vanskeligere for nogen som kan se din internet trafik at bestemme\nat du bruger Tor.\n\n"
+msgstr "BridgeDB kan formidle broer med adskillige %styper udskiftelige transporter%s\nsom kan hjælpe med at sløre dine forbindelser til Tor-netværket, og dermed\ngøre det vanskeligere for nogen som kan se din internettrafik at bestemme\nat du bruger Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Nogle broer med IPv6-adresser er også tilgængelige, men ikke alle udskiftelige\ntransporter understøtter IPv6.\n\n"
+msgstr "Nogle broer med IPv6-adresser er også tilgængelige, dog er nogle udskiftelige\ntransporter ikke kompatible med IPv6.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen\nudskiftelige transporter %s hvilket måske ikke lyder så smart, men de kan\nstadigvæk hjælpe med at omgå internet censur i mange tilfælde.\n\n"
+msgstr "BridgeDB har ydermere masser af konventionelle broer %s uden nogen\nudskiftelige transporter %s hvilket måske ikke lyder så smart, men de kan\ni mange tilfælde stadigvæk hjælpe med at omgå internetcensur.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Hvad er broer?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Broer %s er Tor-relæer som hjælper dig med at omgå censur."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
-msgstr "Jeg har brug for en alternativ metode til at få broer på!"
+msgstr "Jeg har brug for en alternativ metode til at hente broer på!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "En anden måde at finde broer er at sende en e-mail til %s. Bemærk venligst at du skal\nsende mailen fra en konto hos en af de følgende e-mailudbydere:\n%s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "En anden måde til at hente broer på er at sende en e-mail til %s. Lad e-mailens emne\nvære tomt og skriv \"get transport obfs4\" i e-mailens meddelelseskrop. Bemærk venligst\nat du skal sende e-mailen fra en konto hos en af de følgende e-mailudbydere:\n%s eller %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Mine broer virker ikke! Jeg har brug for hjælp!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis Tor ikke virker for dig kan du sende en e-mail til %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Prøv at inkluderer så meget information om din sag som muligt, der i blandt:\nEn liste af broer og udskiftelige transporter du har prøvet at bruge, din\nTor Browser-version, hvilke beskeder Tor gav, osv."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Hvis din Tor Browser ikke kan oprette forbindelse, så se %s og vores %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
-msgstr "Her er dine bro linjer:"
+msgstr "Her er dine brolinjer:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
-msgstr "Find broer!"
+msgstr "Hent broer!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mekanismer til brodistribution"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementerer fire mekanismer til at distribuere broer: \"HTTPS\", \"Moat\",\n\"E-mail\" og \"Reserveret\". Broer som ikke distribueres over BridgeDB bruger\npseudomekanismen \"Ingen\". Følgende liste forklarer kort hvordan mekanismerne\nvirker og vores %sBridgeDB metrics%s visualiserer hvor populære hver\nmekanisme er."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Distributionsmekanismen \"HTTPS\" uddeler broer over webstedet. Hent broer ved at\ngå til %sbridges.torproject.org%s og vælge dine foretrukne valgmuligheder\nog løs den efterfølgende CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Distributionsmekanismen \"Moat\" er en del af Tor Browser som giver brugerne\nmulighed for at anmode om broer i deres Tor Browser-indstillinger. Hent broer ved\nat gå til din Tor Browsers %sTor-indstillinger%s og klik på \"Anmod om en ny bro\", løs\nden efterfølgende CAPTCHA og Tor Browser tilføjer automatisk dine nye\nbroer."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Brugerne kan anmode om broer fra \"Email\"-distributionsmekanismen ved at sende en\ne-mail til %sbridges@xxxxxxxxxxxxxx%s og skrive \"get transport obfs4\" i\ne-mailens krop."
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reserveret"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB vedligeholder et mindre antal broer som ikke distribueres automatisk.\nVi reserverer i stedet broerne til manuel distribution og uddeler dem til\nikke-statslige organisationer og andre organisationer og enkeltpersoner som\nbehøver broer. Broer som distribueres over mekanismen \"Reserveret\" ser måske\nikke brugere i lang tid. Bemærk at distributionsmekanismen \"Reverseret\" kaldes\n\"Unallocated\" i %sbridge pool assignment%s-filer."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Broer som anvender distributionsmekanismen \"Ingen\" distribueres ikke af BridgeDB.\nDet er brooperatørens ansvar er at distribuere deres broer til brugerne.\nBemærk at ved relæsøgning vil en frisk opsætning af broers distributionsmekanisme\nsige \"Ingen\" i op til cirka en dag. Vær lidt tålmodig og\nden vil blive ændret til broens faktiske distributionsmekanisme.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Vælg venligst valgmuligheder for brotypen:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
-msgstr "Har du brug for IPv6 adresser?"
+msgstr "Har du brug for IPv6-adresser?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Har du brug for en %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
-msgstr "Din browser kan ikke vise billeder ordentligt."
+msgstr "Din browser viser ikke billederne ordentligt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Indtast tegnene fra billedet ovenfor..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "SÃ¥dan starter du med at bruge dine broer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "For at tage broer ind i Tor Browser, gå da først til %s Tor Browser\ndownloadside %s og følg instruktionerne i hvordan Tor Browser \ndownloades og startes."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Først skal du %sdownloade Tor Browser%s. Vores Tor Browser-brugermanual\n forklarer hvordan du kan tilføje dine broer til Tor Browser. Hvis du\n bruger Windows, Linux eller OS X, så %sklik her%s for at lærer mere.\n Hvis du bruger Android, så %sklik her%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Når \"Tor-netværksindstillinger\"-dialogen popper op, så klik på \"Konfigurer\" og følg guiden til den siger:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Tilføj broerne til din Tor Browser ved at åbne dine\nbrowserpræferencer og klikke på \"Tor\" og så tilføje dem til\nfeltet \"Formidl en bro\"."
-#. 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 "Blokerer eller på anden vis censurerer din internetudbyder forbindelser\ntil Tor-netværket?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Anmod om uslørede Tor-broer.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Vælg \"Ja\" og klik så på \"Næste\". For at konfigurere dine nye broer, kopiér\nog indsæt brolinjerne i den næste input boks. Klik til sidst 'Forbind', og så\ner du klar! Hvis du støder på problemer, så prøv at klikke på\n\"Hjælp\"-knappen i \"Tor-netværksindstillinger\"-guiden for at få yderligere hjælp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Vis denne besked."
-
-#. 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 "Anmod almindelige broer."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Anmod IPv6-broer."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Anmod om udskiftelig transport efter TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Anmod om IPv6-broer.)"
-#. 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 "Hent en kopi af BridgeDB's offentlige GnuPG nøgle."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Anmod om obfs4-slørede broer.)"
diff --git a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
index e28fdef..4351dfb 100644
--- a/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/de/LC_MESSAGES/bridgedb.po
@@ -1,16 +1,20 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Christian Kaindl <crisscross.kaindl@xxxxxxxxxx>, 2015
# trantor <clucko3@xxxxxxxxx>, 2014
+# Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>, 2020
+# Emma Peel, 2019
# Ettore Atalan <atalanttore@xxxxxxxxxxxxxx>, 2014
# jschfr <hello@xxxxxxxxxxxxxxx>, 2015
# unknwon_anonymous <jackjohnson0001@xxxxxxxxx>, 2014
+# John Dee <Dr_Dee@xxxxxx>, 2019
# Junge Limba <jungelimba@xxxxxxxxx>, 2015
# Konstantin BB, 2014
# Locke <locke@xxxxxxxxxxxxxx>, 2011
+# Philipp Winter, 2019
# qbi <kubieziel@xxxxxxxxxxxxxx>, 2015
# Roland Illig <roland.illig@xxxxxx>, 2018
# Sebastian <sebix+transifex@xxxxxxxx>, 2015
@@ -23,116 +27,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-06-11 23:31+0000\n"
-"Last-Translator: Roland Illig <roland.illig@xxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-17 09:40+0000\n"
+"Last-Translator: Curtis Baltimore <curtisbaltimore@xxxxxxxxxxxxxx>\n"
"Language-Team: German (http://www.transifex.com/otf/torproject/language/de/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: de\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Wir bitten um Entschuldigung. Bei Ihrer Anfrage lief etwas schief."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Sprache"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Einen Fehler melden"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Quellcode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ã?nderungsprotokoll"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Alles auswählen"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRCode anzeigen"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode für Ihre Brückenverbindungen"
-#. 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, es ist etwas schief gegangen!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Es gab vermutlich einen Fehler beim Beschaffen Ihres QR-Codes."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Dieser QR-Code beinhaltet Ihre Brückenverbindungen. Scannen Sie ihn mit einem QR-Code-Leser, um ihre Brückenverbindungen auf ihre mobile und andere Geräte zu kopieren."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ist auf einen Fehler gestoÃ?en."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Im Moment sind keine Brücken verfügbar �"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Möglicherweise sollten Sie versuchen %s zurückzugehen %s und einen anderen Brückentyp auszuwählen!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Schritt %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser %s herunterladen"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Schritt %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Brücken %s erhalten"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Schritt %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Jetzt %s bitte die Brücken zum Tor-Browser hinzufügen %s"
@@ -141,27 +160,27 @@ msgstr "Jetzt %s bitte die Brücken zum Tor-Browser hinzufügen %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sM%sir nur Brücken geben!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Erweiterte Optionen"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nein"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "keine"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -169,69 +188,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sB%srücken erhalten"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Das ist eine automatische Nachricht. Bitte antworten Sie nicht darauf.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dies ist eine automatisierte E-Mail.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Hier sind Ihre Brücken-Server (Bridges):"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Sie haben den Grenzwert überschritten. Bitte verlangsamen! Der kleinste Abstand zwischen \nden E-Mails beträgt %s Stunden. Alle weiteren E-Mails, während dieser Zeit, werden ignoriert."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "BEFEHLE: (Kombinieren Sie BEFEHLE um mehrere Möglichkeiten gleichzeitig anzugeben)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Willkommen bei BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Aktuell unterstützte Transporttypen:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hallo, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo Freund!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "�ffentliche Schlüssel"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Diese E-Mail wurde für %s am %s um %s mit Regenbogen, Einhörnern und Glitzer erstellt."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Wenn diese Brücken nicht das sind, was du brauchst, dann antworte auf diese E-Mail mit einem\nder folgenden Befehle im Textkörper:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -242,7 +229,7 @@ msgid ""
msgstr "BridgeDB kann Brücken-Server mit verschiedenen %stypen der Pluggable Transports%s\nbereitstellen. Diese können helfen, Ihre Verbindungen zum Tor Network zu verschleiern. Damit wird es für Dritte schwieriger\nfestzustellen, dass Sie\nTor benutzen.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -254,7 +241,7 @@ msgstr "Einige Brücken mit IPv6-Adressen sind ebenfalls vorhanden, auch wenn ei
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -263,134 +250,169 @@ msgid ""
"\n"
msgstr "Zusätzlich hat die BridgeDB viele herkömmliche Brücken-Server %s ohnePluggable Transports %s. Das klingt erst einmal nicht so besonders. Es hilft Ihnen dennoch, in vielen Fällen die Internetzensur zu umgehen.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Was sind Brücken?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Brücken-Server %s sind Tor-Relais, die Ihnen dabei helfen, die Zensur zu umgehen."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ich brauche einen anderen Weg, um Adressen von Brücken-Servern zu erhalten."
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Sie können auch eine E-Mail an %s schicken, um Adressen von Brücken-Servern zu erhalten. Die E-Mail muss von einem der folgenden E-Mail-Anbieter geschickt werden: %s, %s oder %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Eine weitere Möglichkeit, Brücken zu erhalten, ist das Senden einer E-Mail an %s.\nLass den E-Mail Betreff leer und schreibe \"get transport obfs4\" in den\nTextkörper des E-Mail. Bitte beachte, dass du die E-Mail mit einer Adresse\naus einer der folgenden E-Mail-Anbieter senden musst:\n%s oder %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Meine Brücken-Server funktionieren nicht! Ich brauche Hilfe!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Sollte Tor bei Ihnen nicht funktionieren, senden Sie bitte eine E-Mail an %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Versuchen Sie in Ihrer E-Mail möglichst viele Informationen über Ihr Problem einzubeziehen, \neinschlie�lich einer Liste der Brücken-Server und der Pluggable Transports, die Sie versuchten zu benutzen, \nIhre Tor-Browser-Version, und jegliche Meldungen, die Tor gegeben hat, usw."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Falls Tor keine Verbindung herstellen kann, lesen Sie bitte %s und unsere%s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Hier sind Ihre Brückenadressen:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Erhalten Sie Adressen von Brücken-Servern!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Brücken-Verteilungsmechanismen"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementiert vier Mechanismen, um Brücken zu verteilen: \"HTTPS\", \"Moat\",\n\"E-Mail\", und \"Reserviert\". Brücken, die nicht über BridgeDB verteilt werden, verwenden\nden Pseudo-Mechanismus \"None\". Die folgende Liste erklärt kurz, wie diese\nMechanismen funktionieren und unsere %sBridgeDB-Metriken%s veranschaulichen, wie beliebt jedes der\nMechanismen ist."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Der \"HTTPS\"-Verteilungsmechanismus verteilt Brücken über diese Website. Um Brücken\nzu erhalten, gehe zu %sbridges.torproject.org%swähle deine bevorzugten Optionen und\nlöse das anschlie�ende CAPTCHA ."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Der \"Moat\"-Verteilungsmechanismus ist Teil des Tor Browser, der es den Nutzern erlaubt\nBrücken aus ihren Tor Browser-Einstellungen heraus anzufordern. Um Brücken anzufordern, gehe zu\nden %sTor-Einstellungen%sdeines Tor Browser, klicke auf \"neue Brücke anfordern\", löse das \nnachfolgende CAPTCHA, und der Tor Browser fügt automatisch deine neuen\nBrücken hinzu."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Benutzer können Brücken aus dem \"E-Mail\"-Verteilungsmechanismus anfordern, indem sie ein\nE-Mail an %sbridges@xxxxxxxxxxxxxx%s senden und \"get transport obfs4\" in den\nE-Mail-Text schreiben ."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reserviert"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB unterhält eine kleine Anzahl von Brücken, die nicht automatisch verteilt werden.\nStattdessen reservieren wir diese Brücken für die manuelle Verteilung und\ngeben sie an NGOs und andere Organisationen und Einzelpersonen heraus, die\nBrücken benötigen. Brücken, die über den \"Reserviert\"-Mechanismus verteilt sind, dürfen\ndie Benutzer nicht lange sehen. Beachte, dass in %sBrücken-Pool-Zuweisungsdateien%s der \"reservierte\" Verteilungsmechanismus \"Nicht zugewiesen\" genannt wird."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nichts"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Brücken, deren Verteilungsmechanismus \"None\" ist, werden von BridgeDB nicht verteilt.\nEs liegt in der Verantwortung der betreibenden Person der Brücke, seine Brücken an Benutzer zu verteilen.\nBeachte, dass bei der Relay-Suche der Verteilungs-Mechanismus einer frisch eingerichteten Brücke\nfür bis zu etwa einem Tag \"None\" sagt. Sei ein wenig geduldig, dann\nwird es zum eigentlichen Verteilungsmechanismus der Brücke wechseln.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Bitte wählen Sie die Optionen für den Brückentyp aus:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Benötigen Sie IPv6-Adressen?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Benötigen Sie eine %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Bilder werden in Ihrem Browser nicht korrekt dargestellt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Bitte geben Sie die Zeichen aus dem oberen Bild ein."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "So starten Sie die Benutzung Ihrer Brücken"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Um Brücken in Tor Browser einzugeben, gehe erst auf die %s Tor Browser Downloadseite %s und folge dort den Anweisungen zum Download und Starten von Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Als Erstes musst du %sTor Browser herunterladen%s. Unser Tor Browser Benutzer-\nHandbuch erklärt, wie du deine Brücken zum Tor Browser hinzufügen kannst. Wenn du \nWindows, Linux, or OS X verwendest, %sklick hier%s um mehr zu erfahren. Wenn du \nAndroid verwendest, %sklick hier%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Wenn der Dialog mit den »Tor-Netzwerkeinstellungen« erscheint, \nklicken Sie auf »Konfigurieren« und folgen den Anweisungen des Assistenten: "
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Füge diese Brücken zu deinem Tor Browser hinzu, indem du die Einstellungen deines Browsers öffnest,\nauf \"Tor\" klickst und sie dann dem Feld \"Eine\nBrücke zur Verfügung stellen\" hinzufügst."
-#. 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 "Blockiert oder zensiert Ihr Internetanbieter (ISP) die Verbindungen zum Tor-Netzwerk?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Uneingeschränkte Tor-Brücken anfordern.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Wählen Sie »Ja« und klicken dann auf »Weiter«. Um Ihre neuen Brücken zu konfigurieren, kopieren Sie die \nZeilen mit den Adressen der Brücken und fügen sie in das Texteingabefeld ein. Zum Schluss klicken Sie auf \n»Verbinden« und Sie können loslegen! Falls Sie Schwierigkeiten haben, \nversuchen Sie bitte auf den »Hilfe«-Knopf im Assistenten der »Tor- Netzwerkeinstellungen« zu klicken, \num weitere Hilfe zu erhalten."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Diese Nachricht anzeigen."
-
-#. 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 "Standard-Brücken anfordern."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6-Brücken anfordern."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Einen Pluggable Transport des TYPEs anfordern."
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6-Brücken anfordern.)"
-#. 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 "Eine Kopie des öffentlichen GnuPG-Schlüssels der Brückendatenbank erhalten."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Uneingeschränkte obfs4-Brücken anfordern.)"
diff --git a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
index 91fc639..dba2992 100644
--- a/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/el/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Adrian Pappas <pappasadrian@xxxxxxxxx>, 2014
@@ -8,13 +8,15 @@
# andromeas <andromeas@xxxxxxxxxxx>, 2014
# A Papac <ap909219@xxxxxxxxxxxxxx>, 2018
# oahanx, 2014
+# Elektra M. <safiragon@xxxxxxxx>, 2020
# Ilias Giannaros <iliasgnrs@xxxxxxxxx>, 2015
# isv31 <36b043a6@xxxxxxxxxxxxxxx>, 2014
# kotkotkot <kotakota@xxxxxxxxx>, 2013
# kotkotkot <kotakota@xxxxxxxxx>, 2012
# LOUKAS SKOUROLIAKOS, 2015
+# Nikolaos Kostakos <kosnickx@xxxxxxxxx>, 2019
# Orion Belt <orionbelt2@xxxxxxxxx>, 2018
-# Panos <alwayslivid@xxxxxxxxxxxxxx>, 2018-2019
+# Panagiotis Vasilopoulos, 2018-2019
# Sofia K., 2018
# mitzie <accounts@xxxxxxxxxxxx>, 2013
# Wasilis Mandratzis <inactive+Wasilis@xxxxxxxxxxxxx>, 2013
@@ -22,116 +24,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Greek (http://www.transifex.com/otf/torproject/language/el/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: el\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ΣÏ?γνÏ?μη! Î?άÏ?ι Ï?ήγε Ï?Ï?Ï?αβά με Ï?ο αίÏ?ημά Ï?αÏ?."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Î?λÏ?Ï?Ï?α"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Î?ναÏ?οÏ?ά Î Ï?οβλήμαÏ?οÏ?"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ΠηγαίοÏ? Î?Ï?δικαÏ?"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Î?Ï?Ï?είο καÏ?αγÏ?αÏ?ήÏ? αλλαγÏ?ν"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Î?Ï?αÏ?ή"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Î?Ï?ιλογή Ï?λÏ?ν"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Î?μÏ?άνιÏ?η QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Î?Ï?Ï? Ï?,Ï?ι Ï?αίνεÏ?αι, Ï?Ï?ήÏ?ξε Îνα Ï?Ï?Ï?βλημα καÏ?ά Ï?ην ανάκÏ?ηÏ?η Ï?οÏ? QRCode Ï?αÏ?. "
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 scanner για να ανÏ?ιγÏ?άÏ?εÏ?ε Ï?ιÏ? γÏ?αμμÎÏ? γÎÏ?Ï?Ï?αÏ? Ï?ε κινήÏ?η και άλλη Ï?Ï?Ï?κεÏ?ή."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Î?εν Ï?Ï?άÏ?Ï?οÏ?ν διαθÎÏ?ιμεÏ? γÎÏ?Ï?Ï?εÏ?..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Î?ήμα %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Î?αÏ?εβάÏ?Ï?ε Ï?ον %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Î?ήμα %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Î?Ï?οκÏ?ήÏ?Ï?ε Ï?ιÏ? %s γÎÏ?Ï?Ï?εÏ?%s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Î?ήμα %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ΤÏ?Ï?α %s Ï?Ï?οÏ?θÎÏ?Ï?ε Ï?ιÏ? γÎÏ?Ï?Ï?εÏ? Ï?Ï?ον Tor Browser %s"
@@ -140,27 +157,27 @@ msgstr "ΤÏ?Ï?α %s Ï?Ï?οÏ?θÎÏ?Ï?ε Ï?ιÏ? γÎÏ?Ï?Ï?εÏ? Ï?Ï?ον Tor Browse
#. 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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sÎ?%sÏ?λÏ?Ï? δÏ?Ï?ε μοÏ? γÎÏ?Ï?Ï?εÏ?!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Î?Ï?ιλογÎÏ? για Ï?Ï?οÏ?Ï?Ï?ημÎνοÏ?Ï?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Î?Ï?ι"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "κανÎνα"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sÎ?%sαι!"
@@ -168,69 +185,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sÎ?%sήÏ?η Î?εÏ?Ï?Ï?Ï?ν"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Î?Ï?Ï?Ï? είναι Îνα αÏ?Ï?ομαÏ?οÏ?οιημÎνο μήνÏ?μα· Ï?αÏ?ακαλÏ? μην αÏ?ανÏ?ήÏ?εÏ?ε.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Î?Ï?ίÏ?Ï?ε, οι γÎÏ?Ï?Ï?ÎÏ? Ï?αÏ?:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Î?εÏ?εÏ?άÏ?αÏ?ε Ï?ο Ï?Ï?ιο. ΠαÏ?ακαλÏ?, Ï?ιο αÏ?γά! Î? ελάÏ?ιÏ?Ï?οÏ? Ï?Ï?Ï?νοÏ? μεÏ?αξÏ? διαδοÏ?ικÏ?ν email\n είναι %s Ï?Ï?εÏ?. Î?λα Ï?α ενδιάμεÏ?α email Ï?ε αÏ?Ï?Ï? Ï?ο Ï?Ï?ονικÏ? διάÏ?Ï?ημα θα αγνοοÏ?νÏ?αι."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Î?Î?ΤÎ?Î?Î?Σ: (Ï?Ï?νδÏ?άÏ?Ï?ε Î?Î?ΤÎ?Î?Î?Σ για να εÏ?ιλÎξεÏ?ε Ï?ολλαÏ?λÎÏ? Ï?αÏ?αμÎÏ?Ï?οÏ?Ï? Ï?αÏ?Ï?Ï?Ï?Ï?ονα)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Î?αλÏ?Ï? ήÏ?θαÏ?ε Ï?Ï?ο BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Î¥Ï?οÏ?Ï?ηÏ?ιζÏ?μενα transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Î?ειά Ï?αÏ?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Î?εια Ï?οÏ?, Ï?ίλε!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Î?Ï?Ï?Ï? Ï?ο email Ï?αÏ?ήÏ?θη με αγάÏ?η, οÏ?Ï?άνια Ï?Ï?ξα και Ï?Ï?Ï?Ï?Ï?Ï?κονη\nγια Ï?ον/Ï?ην %s, Ï?ην %s Ï?Ï?ιÏ? %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -241,7 +226,7 @@ msgid ""
msgstr "Î? BridgeDB μÏ?οÏ?εί να Ï?αÏ?ÎÏ?ει γÎÏ?Ï?Ï?εÏ? με διάÏ?οÏ?οÏ?Ï? %sÏ?Ï?Ï?οÏ?Ï? Pluggable Transports%s,\nÏ?α οÏ?οία μÏ?οÏ?οÏ?ν να κÏ?Ï?Ï?οÏ?ν Ï?ιÏ? Ï?Ï?νδÎÏ?ειÏ? Ï?αÏ? Ï?Ï?ο δίκÏ?Ï?ο Tor, κάνονÏ?αÏ? Ï?ο\nδÏ?Ï?κολÏ?Ï?εÏ?ο για κάÏ?οιον Ï?οÏ? Ï?αÏ?ακολοÏ?θεί Ï?η κίνηÏ?η Ï?αÏ? να καÏ?αλάβει Ï?Ï?Ï?\nÏ?Ï?ηÏ?ιμοÏ?οιείÏ?ε Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -253,7 +238,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -262,134 +247,169 @@ msgid ""
"\n"
msgstr "Î?Ï?ίÏ?ηÏ?, η BridgeDB ÎÏ?ει Ï?ολλÎÏ? Ï?αλιÎÏ? καλÎÏ? γÎÏ?Ï?Ï?εÏ? %s Ï?Ï?Ï?ίÏ?\nPluggable Transports %s Ï?οÏ? ίÏ?Ï?Ï? δεν ακοÏ?γεÏ?αι καÏ?αÏ?ληκÏ?ικÏ?, αλλά Ï?ε Ï?ολλÎÏ? Ï?εÏ?ιÏ?Ï?Ï?Ï?ειÏ? μÏ?οÏ?οÏ?ν να Ï?αÏ? βοηθήÏ?οÏ?ν να Ï?αÏ?ακάμÏ?εÏ?ε Ï?η λογοκÏ?ιÏ?ία.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Τι είναι οι γÎÏ?Ï?Ï?εÏ?;"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "Î?ι %s Î?ÎÏ?Ï?Ï?εÏ? %s είναι Tor αναμεÏ?αδÏ?Ï?εÏ? Ï?οÏ? βοηθοÏ?ν Ï?Ï?ην Ï?αÏ?άκαμÏ?η Ï?ηÏ? λογοκÏ?ιÏ?ίαÏ?. "
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "ΧÏ?ειάζομαι Îναν εναλλακÏ?ικÏ? Ï?Ï?Ï?Ï?ο για λήÏ?η γεÏ?Ï?Ï?Ï?ν! "
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Î?ναλλακÏ?ικά μÏ?οÏ?είÏ?ε να λάβεÏ?ε γÎÏ?Ï?Ï?εÏ? Ï?Ï?ελνονÏ?αÏ? email Ï?Ï?ο %s. Î Ï?ÎÏ?ει να Ï?Ï?είλεÏ?ε email Ï?Ï?ηÏ?ιμοÏ?οιÏ?νÏ?αÏ? μία διεÏ?θÏ?νÏ?η email αÏ?Ï? Îναν αÏ?Ï? Ï?οÏ?Ï? Ï?αÏ?ακάÏ?Ï? Ï?άÏ?οÏ?οÏ?Ï?:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Î?ναÏ? άλλοÏ? Ï?Ï?Ï?Ï?οÏ? για να λάβεÏ?ε γÎÏ?Ï?Ï?εÏ? είναι να Ï?Ï?είλεÏ?ε Îνα email Ï?Ï?ο %s. Î?Ï?ήÏ?Ï?ε Ï?ο θÎμα Ï?οÏ? email κενÏ? και γÏ?άÏ?Ï?ε \"get transport obfs4\" Ï?Ï?ο Ï?Ï?μα Ï?οÏ? email. ΠαÏ?ακαλοÏ?με Ï?ημειÏ?Ï?Ï?ε Ï?Ï?Ï? Ï?Ï?ÎÏ?ει να Ï?Ï?είλεÏ?ε Ï?ο email Ï?Ï?ηÏ?ιμοÏ?οιÏ?νÏ?αÏ? μία διεÏ?θÏ?νÏ?η αÏ?Ï? Îναν αÏ?Ï? Ï?οÏ?Ï? Ï?αÏ?ακάÏ?Ï? Ï?άÏ?οÏ?οÏ?Ï? email: %s ή %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Î?ι γÎÏ?Ï?Ï?εÏ? μοÏ? δεν λειÏ?οÏ?Ï?γοÏ?ν! ΧÏ?ειάζομαι βοήθεια! "
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Î?ν Ï?ο Tor Ï?αÏ? δε δοÏ?λεÏ?ει, Ï?αÏ?ακαλÏ? Ï?Ï?είλÏ?ε email Ï?Ï?ο %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ΠαÏ?ακαλÏ? δÏ?Ï?Ï?ε μαÏ? Ï?Ï?ο Ï?ο δÏ?ναÏ?Ï?ν Ï?εÏ?ιÏ?Ï?Ï?Ï?εÏ?εÏ? Ï?ληÏ?οÏ?οÏ?ίεÏ? για Ï?ο \nÏ?Ï?άλμα Ï?οÏ? Ï?Ï?νανÏ?ήÏ?αÏ?ε, Ï?Ï?Ï?Ï? Ï?η λίÏ?Ï?α γεÏ?Ï?Ï?Ï?ν και Ï?α Pluggable Transports \nÏ?οÏ? Ï?Ï?οÏ?Ï?αθήÏ?αÏ?ε να Ï?Ï?ηÏ?ιμοÏ?οιήÏ?εÏ?ε, Ï?ην ÎκδοÏ?η Ï?οÏ? Tor Browser, \nÏ?,Ï?ι μηνÏ?μαÏ?α Îδειξε Ï?ο Tor, κÏ?λ."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Î?άν ο Tor Browser Ï?αÏ? δεν μÏ?οÏ?εί να Ï?Ï?νδεθεί, Ï?αÏ?ακαλÏ? Ï?ίξÏ?ε μια μαÏ?ιά Ï?Ï?ο %s και Ï?Ï?ο δικÏ? μαÏ? %s. "
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Î?Ï?ίÏ?Ï?ε, οι γÏ?αμμÎÏ? για Ï?ιÏ? γÎÏ?Ï?Ï?ÎÏ? Ï?αÏ?:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Î?ήÏ?η Î?εÏ?Ï?Ï?Ï?ν!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Î?αμία"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "ΠαÏ?ακαλÏ? εÏ?ιλÎξÏ?ε Ï?ιÏ? εÏ?ιλογÎÏ? για Ï?ον Ï?Ï?Ï?ο Ï?ηÏ? γÎÏ?Ï?Ï?αÏ?:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "ΧÏ?ειάζεÏ?Ï?ε μια διεÏ?θÏ?νÏ?η IPv6;"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Î?ήÏ?Ï?Ï? Ï?Ï?ειάζεÏ?Ï?ε Îνα %s;"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Î? browser Ï?αÏ? δεν εμÏ?ανίζει Ï?ιÏ? εικÏ?νεÏ? Ï?Ï?Ï?Ï?ά."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Î?ιÏ?άγεÏ?ε Ï?οÏ?Ï? Ï?αÏ?ακÏ?ήÏ?εÏ? αÏ?Ï? Ï?ην Ï?αÏ?αÏ?άνÏ? Ï?Ï?Ï?ογÏ?αÏ?ία..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Î Ï?Ï? να αÏ?Ï?ίÏ?εÏ?ε να Ï?Ï?ηÏ?ιμοÏ?οιείÏ?ε Ï?ιÏ? γÎÏ?Ï?Ï?εÏ? Ï?αÏ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Î?ια να ειÏ?άγεÏ?ε bridges Ï?Ï?ο Tor Browser, αÏ?Ï?ικά εÏ?ιλÎξÏ?ε %s Tor Browser Ï?ελίδα\nκαÏ?εβάÏ?μαÏ?οÏ?%s ÎÏ?ειÏ?α ακολοÏ?θήÏ?Ï?ε Ï?ιÏ? οδηγίεÏ? για καÏ?ÎβαÏ?μα και εκκίνηÏ?η Ï?οÏ? \nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Î?Ï?αν Ï?Ï?άÏ?εÏ?ε Ï?Ï?ο διάλογο \"ΡÏ?θμίÏ?ειÏ? δικÏ?Ï?οÏ? Ï?οÏ? Tor\" , εÏ?ιλÎξÏ?ε \"ΡÏ?θμιÏ?η\" και ακολοÏ?θήÏ?Ï?ε Ï?οÏ?Ï? διαλÏ?γοÏ?Ï? μÎÏ?Ï?ι να Ï?αÏ? Ï?Ï?Ï?ήÏ?ει:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Î? Ï?άÏ?οÏ?οÏ? (ISP) Ï?αÏ? μÏ?λοκάÏ?ει ή με οÏ?οιοδήÏ?οÏ?ε Ï?Ï?Ï?Ï?ο λογοκÏ?ίνει Ï?Ï?νδÎÏ?ειÏ?\nÏ?Ï?ο δίκÏ?Ï?ο Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Î?Ï?ιλÎξÏ?ε \"Î?αι\" και μεÏ?ά Ï?αÏ?ήÏ?Ï?ε \"Î?Ï?Ï?μενο\". Î?ια να Ï?Ï?θμίÏ?εÏ?ε Ï?α νÎα Ï?αÏ? \nbridges, ανÏ?ιγÏ?άÏ?Ï?ε Ï?ιÏ? γÏ?αμμÎÏ? με Ï?ιÏ? διεÏ?θÏ?νÏ?ειÏ? Ï?Ï?ν bridges Ï?Ï?ο κοÏ?Ï?ί \nκειμÎνοÏ?. Î?εÏ?ά Ï?αÏ?ήÏ?Ï?ε \"ΣÏ?νδεÏ?η\" και Ï?Ï?ÎÏ?ει να είÏ?Ï?ε ενÏ?άξει! Î?ν \nανÏ?ιμεÏ?Ï?Ï?ίÏ?εÏ?ε Ï?Ï?οβλήμαÏ?α, εÏ?ιλÎξÏ?ε Ï?ο κοÏ?μÏ?ί \"Î?οήθεια\" Ï?Ï?ιÏ? \"ΡÏ?θμίÏ?ειÏ? \nδικÏ?Ï?οÏ? Ï?οÏ? Tor\"."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Î?ίÏ?ηÏ?η Ï?αλιÏ?ν καλÏ?ν bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Î?ίÏ?ηÏ?η IPv6 γεÏ?Ï?Ï?Ï?ν."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Î?ηÏ?ήÏ?Ï?ε Îνα Pluggable Transport βάÏ?ει TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Î?άβεÏ?ε Îνα ανÏ?ίγÏ?αÏ?ο Ï?οÏ? δημοÏ?ίοÏ? GnuPG κλειδιοÏ? Ï?οÏ? BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
index 8bb8bff..c42e494 100644
--- a/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/en_GB/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,140 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Andi Chandler <andi@xxxxxxxxxxx>, 2014-2015
+# Andi Chandler <andi@xxxxxxxxxxx>, 2014-2015,2019-2020
# Richard Shaylor <rshaylor@xxxxxx>, 2014
# ronnietse <tseronnie@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2017-09-19 23:30+0000\n"
-"Last-Translator: Andi Chandler <andi@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: en_GB\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Language"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Report a Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Source Code"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Changelog"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Select All"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Show QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
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
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "There are no bridges available currently..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Step %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Step %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Get %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Step %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Now %s add the bridges to Tor Browser %s"
@@ -128,27 +143,27 @@ msgstr "Now %s add the bridges to Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sust give me bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Advanced Options"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -156,69 +171,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[This is an automated email.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Here are your bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
-#: 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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Welcome to BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Currently supported transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hello, friend!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "This email was generated with rainbows, unicorns, and sparkles\nfor %s on %s at %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "If these bridges are not what you need, reply to this email with one of\nthe following commands in the message body:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "What are bridges?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "I need an alternative way of getting bridges!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Another way to get bridges is to send an email to %s. Leave the email subject\nempty and write \"get transport obfs4\" in the email's message body. Please note\nthat you must send the email using an address from one of the following email\nproviders: %s or %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "My bridges don't work! I need help!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "If your Tor Browser cannot connect, please take a look at the %s and our %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Here are your bridge lines:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Get Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Bridge distribution mechanisms"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\nthe pseudo-mechanism \"None\". The following list briefly explains how these\nmechanisms work and our %sBridgeDB metrics%s visualise how popular each of the\nmechanisms is."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\nbridges, go to %sbridges.torproject.org%s, select your preferred options, and\nsolve the subsequent CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\nrequest bridges from inside their Tor Browser settings. To get bridges, go to\nyour Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\nsubsequent CAPTCHA, and Tor Browser will automatically add your new\nbridges."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Users can request bridges from the \"Email\" distribution mechanism by sending an\nemail to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\nemail body."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reserved"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB maintains a small number of bridges that are not distributed\nautomatically. Instead, we reserve these bridges for manual distribution and\nhand them out to NGOs and other organisations and individuals that need\nbridges. Bridges that are distributed over the \"Reserved\" mechanism may not\nsee users for a long time. Note that the \"Reserved\" distribution mechanism is\ncalled \"Unallocated\" in %sbridge pool assignment%s files."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "None"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\nIt is the bridge operator's responsibility to distribute their bridges to\nusers. Note that on Relay Search, a freshly set up bridge's distribution\nmechanism says \"None\" for up to approximately one day. Be a bit patient, and\nit will then change to the bridge's actual distribution mechanism.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Please select options for bridge type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Do you need IPv6 addresses?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Do you need a %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Your browser is not displaying images properly."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Enter the characters from the image above..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "How to start using your bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n Manual explains how you can add your bridges to Tor Browser. If you are\n using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n are using Android, %sclick here%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Add these bridges to your Tor Browser by opening your browser\npreferences, clicking on \"Tor\", and then adding them to the \"Provide a\nbridge\" field."
-#. 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 "Does your Internet Service Provider (ISP) block or otherwise censor connections\nto the Tor network?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Request unobfuscated Tor bridges.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Request vanilla bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Request IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Request a Pluggable Transport by TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Request IPv6 bridges.)"
-#. 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 "Get a copy of BridgeDB's public GnuPG key."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Request obfs4 obfuscated bridges.)"
diff --git a/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po
index 9a919ec..5f07adc 100644
--- a/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/eo/LC_MESSAGES/bridgedb.po
@@ -1,128 +1,142 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# identity, 2012
# Mara Monstro <errydayanarchy@xxxxxxxxxx>, 2018
# Rico Chan <rico@xxxxxxxxxxx>, 2014
# trio <trio@xxxxxxxxxxxxx>, 2011
-# Tyquan Bush, 2019
+# 6c9ad24fb5ff3a00859fb84514d79173, 2019
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-07-11 23:22+0000\n"
-"Last-Translator: Tyquan Bush\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: eo\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Pardonu! Io ne funkcias pri via peto."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingvo"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "raporti cimo"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "fontkodo"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Å?anÄ?oprotokolo"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "kontakto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "elekti Ä?ion"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Montri QR-kodon"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR Kodo por viaj ponto linioj"
-#. 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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Å?ajnas, ke estis eraro ricevante vian QR-kodon."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Ä?i tiu QR-kodo enhavas viajn ponto liniojn. Skanu Ä?in per QR-leganto por kopii viajn ponto liniojn sur poÅ?telefonojn kaj aliajn aparatojn."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Nuntempe ne ekzistas retpontojn."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "paÅ?o %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "paÅ?o %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "ekhavi %s retpotojn %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "paÅ?o %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
@@ -131,27 +145,27 @@ msgstr "Nun %s aldonu la retpontojn al la Tor-retumilo %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sT%suj donu retpontojn al mi!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "detalaj opcioj"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%ses!"
@@ -159,69 +173,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Jen viaj retpontoj."
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Estu bonvena al BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Nuntempe subtenata transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Saluton, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Saluton, amiko!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ä?i tiu retletero estas generita kun Ä?ielarkoj, unikornoj kaj steloj\npor %s je %s, %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +214,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -244,7 +226,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +235,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kio estas retpontoj?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Mi bezonas alternativon ekhavi retpontojn!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Miaj retpontoj ne funkcias! Mi bezonas helpon!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-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".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Jen viaj retpontoj:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ekhavu retpontojn!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Neniom"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Bonvolu selekti opciojn pri retpontospeco."
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ä?u vi bezonas IPv6-adresojn?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ä?u vi bezonas %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Via retumilo vidigas bildojn ne dece."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Enigu la literoj en la bildo Ä?i-supre."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Kiel komenci uzi viajn retpontojn."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Por enigi retpontojn en Tor Browser, unue iru al la %s elÅ?uta paÄ?o de Tor Browser %s kaj poste sekvu la instruojn tie por elÅ?uti kaj startigi Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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: "
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Ä?u via provizanto de retservoj (angle: ISP) blokas aÅ alimaniere cenzuras konektojn al la Tor-reto?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Peti regulajn retpontojn (nepermutebla transporta retpontoj / non-Pluggable Transport bridges)."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Peti IPv6-retpontojn."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Peti permutebla transporto de TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Ekhavi kopio de publika GnuPG-Å?losilo de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
index d0883fb..4941e14 100644
--- a/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# dark_yoshi <angelargi@xxxxxxxx>, 2014
@@ -9,7 +9,7 @@
# BL <tresemes3@xxxxxxxxx>, 2014
# Edward Navarro, 2015
# Emma Peel, 2017-2019
-# eulalio barbero espinosa <eulaliob@xxxxxxxxx>, 2016
+# eulalio barbero espinosa <eulaliob@xxxxxxxxx>, 2016,2019-2020
# Ignacio RodrÃguez <inactive+i5o@xxxxxxxxxxxxx>, 2015
# NinjaTuna <nort0ngh0st@xxxxxxxxxxx>, 2011
# Noel Torres <envite@xxxxxxxxxxxxx>, 2013
@@ -24,116 +24,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-03-10 11:12+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 17:09+0000\n"
+"Last-Translator: eulalio barbero espinosa <eulaliob@xxxxxxxxx>\n"
"Language-Team: Spanish (http://www.transifex.com/otf/torproject/language/es/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "¡Lo sentimos! Algo ha fallado al procesar tu solicitud."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Informar sobre un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registro de cambios"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar todos"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para tus lÃneas de puentes"
-#. 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, ¡la liamos! "
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Parece que hubo un error al obtener tu código QR. "
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 código QR contiene sus lÃneas de puente. Escanéalo con un lector de códigos QR para copiar tus lÃneas de puente a dispositivos móviles y otros dispositivos."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ha encontrado un error"
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ahora mismo no hay ningún puente disponible..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "¡Tal vez deberÃas probar a %s retroceder %s y seleccionar un tipo distinto de puente!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s "
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Descarga %s el Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s "
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Consigue %s puentes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s "
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ahora %s añade los puentes al Tor Browser %s"
@@ -142,27 +157,27 @@ msgstr "Ahora %s añade los puentes al Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "¡Dame %sS%sólo puentes! "
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opciones avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "¡%sS%sÃ!"
@@ -170,69 +185,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sC%sonseguir Puentes"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Este es un mensaje automático; por favor no respondas.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Este es un correo automático.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Aquà tienes tus puentes:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Has excedido el lÃmite de cuota. Por favor, ¡más despacio! El tiempo mÃnimo entre correos electrónicos es %s horas. Durante este periodo se ignorarán los correos. "
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina COMMANDs para especificar de manera simultánea opciones múltiples)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "¡Bienvenido a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOs de transporte soportados actualmente:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "¡Eh, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "¡Hola amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves públicas"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este correo fue generado con arcoiris, unicornios y estrellitas para %s el %s a las %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Si estos no son los puentes que necesitas, responde a este correo con una\nde las siguientes órdenes en el cuerpo del mensaje."
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -243,7 +226,7 @@ msgid ""
msgstr "BridgeDB puede proporcionar puentes con diferentes %stipos de Pluggable Transports%s que pueden ayudar a ofuscar tus conexiones a la red Tor, dificultando determinar que estás usando Tor para alguien que esté observando tu tráfico de Internet.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -255,7 +238,7 @@ msgstr "También hay disponibles varios puentes con direcciones IPv6, aunque alg
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -264,134 +247,169 @@ msgid ""
"\n"
msgstr "Además, BridgeDB tiene un montón de puentes estándar %s sin ningún Pluggable Transport %s , lo que tal vez no suena tan molón, pero que todavÃa pueden ayudar a eludir la censura en Internet en muchos casos.\n\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "¿Qué son los puentes?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "Los %s puentes %s son repetidores Tor que te ayudan a eludir la censura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito un modo alternativo de obtención de puentes de red!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Otra forma de obtener puentes de red es enviar un correo a %s. Ten en cuenta que tienes que enviar el correo usando una dirección de uno de los siguientes proveedores de correo electrónico:\n%s, %s o %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Otra forma de conseguir puentes es enviando un correo electrónico a%s. Deja el asunto del \ncorreo vacÃo y escribe \"get transport obfs4\"en el cuerpo del mensaje del correo. Ten en cuenta\nde que tienes que enviar el correo usando la dirección de uno de los siguientes proveedores\nde correo: %s o %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
-msgstr "¡Mis puentes funcionan! ¡Necesito ayuda!"
+msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, debes enviar un correo a %s"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Intenta incluir tanta información como puedas sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, versión de Tor Browser y cualquier mensaje que Tor haya dado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si tu Tor Browser no puede conectar, lee el %s y nuestro %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Estas son tus lÃneas de puente de red:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "¡Obtener puentes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribución del puente"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementa cuatro mecanismos para distribuir los puentes: \"HTTPS\", \"Moat\",\n\"Email\" y \"Reserved\". Los puentes que no se distribuyen por BridgeDB utilizan el \nseudo-mecanismo \"None\". La siguiente lista explica brevemente cómo funcionan estos\nmecanismos y nuestras%smedidas de BridgeDB%s qué popular es cada uno\nde los mecanismos."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "El mecanismo de distribución \"HTTPS\" distribuye puentes en este sitio web. Para\nobtener puentes, ve a %sbridges.torproject.org%s, selecciona tus opciones\npreferidas, y resuelve el CAPTCHA de rigor."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "El mecanismo de distribución \"Moat\" es parte del Navegador Tor, permitiendo a los\nusuarios solicitar puentes desde dentro de sus configuraciones de Tor. Para obtener\npuentes, ve a %sTor settings%s, click on \"request a new bridge\", de tu Navegador\nTor, pulsa en \"solicitar un nuevo puente\", resuelve el CAPTCHA, y el navegador Tor\nañadirá automáticamente tus nuevos puentes."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Los usuarios pueden solicitar puentes del mecanismo de distribución del \"Correo\nElectrónico\" enviando un correo electrónico a %sbridges@xxxxxxxxxxxxxx%s y\nescribiendo \"get transport obfs4\" en el cuerpo del correo electrónico."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr " BridgeDB mantiene un pequeño número de puentes que no se distribuyen\nautomáticamente. En su lugar, reservamos estos puentes para su distribución\nmanual y los repartimos a ONG y otras organizaciones y personas que necesitan\npuentes. Los puentes que se distribuyen mediante el mecanismo \"Reservado\"\npueden no ver usuarios durante mucho tiempo. Nótese que el mecanismo de\ndistribución \"Reservado\" se llama \"No asignado\" en los %sarchivos de\nasignación de puentes%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ninguno"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Los puentes cuyo mecanismo de distribución es \"Ninguno\" no son distribuidos\npor BridgeDB. Es responsabilidad del operador del puente distribuir sus puentes\na los usuarios. Nótese que en la Búsqueda de Relay, el mecanismo de distribución\nde un puente recién instalado dice \"Ninguno\" durante aproximadamente un dÃa. Ten\nun poco de paciencia, y luego se cambiará al mecanismo de distribución real del\npuente.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Por favor, selecciona opciones para el tipo de puente:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitas direcciones IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitas un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no está mostrando las imágenes correctamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Introduce los caracteres de la imagen de arriba..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Cómo comenzar a usar los puentes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Para introducir puentes de red en el Tor Browser, ve a la %s página de descarga del Tor Browser %s y sigue las instrucciones de descarga e inicio del Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Primero, necesitas %sbajarte el Navegador Tor%s. Nuestro Manual de Usuario\ndel Navegador Tor explica como puedes añadir tus puentes al navegador. Si estás\nusando Windows, Linux, u OS X, %sclick aquÃ%s para saber más. Si estás\nusando Android, %sclick aquÃ%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Cuando aparezca el cuadro 'Configuración de red Tor', haz clic en 'Configurar'\ny sigue al asistente hasta que pregunte:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Añade estos puentes a tu navegador Tor abriendo las preferencias\nde tu navegador, clic en \"Tor\" y a continuación añádelos al campo\n\"Proporcionar un puente\"."
-#. 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 "¿Tu proveedor de Internet (ISP) bloquea o censura de alguna manera las conexiones a la red Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicita puentes Tor no ofuscados.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecciona 'SÃ' y luego haz clic en 'Siguiente'. Para configurar tus nuevos\npuentes, copia y pega las lÃneas de puentes en el recuadro de texto.\nPor último, haz clic en 'Conectar', ¡y listo! Si hay algún problema, prueba en 'Ayuda' en el asistente de 'Configuración de red Tor' para asistencia adicional."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Solicitar puentes estándar."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicitar puente de red IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar un Pluggable Transport por TYPE ."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Solicita puentes IPv6)"
-#. 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 "Obtener una copia de la clave pública GnuPG de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Solicita puentes ofuscados obfs4.)"
diff --git a/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po
index 15e14db..5b7a1de 100644
--- a/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es_AR/LC_MESSAGES/bridgedb.po
@@ -1,130 +1,148 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# cametiope <aldohcasa@xxxxxxxxxxx>, 2014
# Alfredo Chaves <achaves.blg@xxxxxxxxx>, 2015
# angelica14 <angmarmt13@xxxxxxxxx>, 2014
+# Burro Moro <burromoro@xxxxxxxxxx>, 2020
# Daniel Gray, 2015
# José Fabián, 2014
+# kaze kaze <kaze@xxxxxxx>, 2019
# ezemelano <melanoeze@xxxxxxxxx>, 2014
+# Pablito Labarta <pablitolabarta@xxxxxxxxx>, 2019
# Pablo Di Noto <pdinoto@xxxxxxxxx>, 2016
# Zuhualime Akoochimoya, 2018-2019
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-04-07 15:16+0000\n"
-"Last-Translator: Zuhualime Akoochimoya\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-17 22:05+0000\n"
+"Last-Translator: Burro Moro <burromoro@xxxxxxxxxx>\n"
"Language-Team: Spanish (Argentina) (http://www.transifex.com/otf/torproject/language/es_AR/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: es_AR\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "¡Lo sentimos! Algo salió mal con tu solicitud."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Reportar un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Bitácora de cambios"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar Todos"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para tus lÃneas de 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 "¡Oh, sonamos!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ha ocurrido un error al obtener tu código QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 código QR contiene tus lÃneas de bridge. Escanealo con un lector de códigos QR para copiarlas en tus dispositivos móviles y otros."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB encontró un error."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "En este momento no existen bridges disponibles..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "¡Tal vez deberÃas %s volver %s y escoger otro tipo de bridge!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Descargar el %s Navegador Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtener %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ahora %s agregá los puentes al Navegador Tor %s"
@@ -133,27 +151,27 @@ msgstr "Ahora %s agregá los puentes al Navegador Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "¡%sS%solamente dáme bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opciones avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "¡%sS%sÃ!"
@@ -161,69 +179,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbtener bridges"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Este es un mensaje automático; por favor, no responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Este es un correo automatizado]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Aquà están tus bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Te has excedido el lÃmite de tasa. ¡Por favor, andá más despacio! El tiempo mÃnimo entre\ncorreos electrónicos es %s horas. Todos los correos electrónicos siguientes en este lapso de tiempo serán ignorados."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combiná COMMANDs para especificar opciones múltiples simultáneamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "¡Bienvenido a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transport actualmente soportados:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "¡Eh, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "¡Hola amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves públicas"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este correo electrónico fue generado con arcoiris, unicornios y destellos\npara %s el %s a las %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Si estos bridges no son lo que necesitas, responda a este correo electrónico con uno de\nlos siguientes comandos en el cuerpo del mensaje:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,7 +220,7 @@ msgid ""
msgstr "BridgeDB puede proveerte bridges con varios %stipos de Pluggable Transports%s,\nque pueden ayudar a ofuscar tus conexiones a Tor Network, haciendo más difÃcil\nque alguien que observe tu tráfico de internet determine que estás\nusando Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -246,7 +232,7 @@ msgstr "Algunos bridges con direcciones IPv6 también están disponibles, aún c
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -255,134 +241,169 @@ msgid ""
"\n"
msgstr "Adicionalmente, BridgeDB tiene varios bridges ordinarios como papel de cuete, %s sin ningún\nPluggable Transports %s, que tal vez no suenen tan genial, pero aún pueden\nayudar a burlar la censura de internet en muchos casos.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "¿Qué son los bridges?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Los Bridges %s son relevos de Tor que te ayudan a evitar la censura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necesito una manera alternativa de obtener bridges!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Otra manera de obtener bridges es enviando un correo electrónico a %s. Por favor notá que debés enviar el correo electrónico usando una dirección de uno de los siguientes proveedores:\n%s, %s o %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Otra forma de obtener bridges es enviar un correo electrónico a %s. Deja el asunto del correo electrónico\nvacÃo y escribe \"get transport obfs4\" en el cuerpo del mensaje del correo electrónico. Ten en cuenta\nque debes enviar el correo electrónico utilizando una dirección de uno de los siguientes correos electrónicos de los \nproveedores: %s or %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "¡Mis bridges no funcionan! ¡Necesito ayuda!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si Tor no funciona, deberÃas enviar un 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".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Intentá incluir toda la información posible sobre tu caso, incluyendo la lista de\npuentes y Pluggable Transports que intentaste usar, la versión de tu Navegador Tor,\ny cualquier mensaje que Tor haya presentado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si Tor no puede conectarse, consultá el %s y nuestro %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Aquà están tus lÃneas de bridges:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "¡Obtené Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribución de Bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementa cuatro mecanismos para distribuir bridges: \"HTTPS\", \"Moat\",\n\"Email\", y \"Reserved\". Los bridges que no se distribuyen a través de BridgeDB utilizan\nel pseudo-mecanismo \"None\". La siguiente lista explica brevemente cómo \nestos mecanismos y nuestras %smétricas de BridgeDB%s visualizan que tan popular\nes el mecanismo."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "El mecanismo de distribución \"HTTPS\" reparte bridges sobre este sitio web. Para obtener\nbridges, dirÃgete a %s bridges.torproject.org%s, selecciona tus opciones preferidas y\nresuelva el CAPTCHA subsiguiente."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "El mecanismo de distribución \"Moat\" es parte del navegador Tor, lo que permite a los usuarios\nsolicitar bridges desde la configuración de su navegador Tor. Para obtener bridges, dirÃgete a\ntu Navegador Tor %sen configuraciones de Tor%s, haz clic en \"solicitar un nuevo bridge\", resuelve el\nCAPTCHA subsiguiente y el Navegador Tor agregará automáticamente tus nuevos\npuentes."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Los usuarios pueden solicitar bridges desde el mecanismo de distribución \"Email\" enviando un\ncorreo electrónico a %sbridges@xxxxxxxxxxxxxx%s y escribiendo \"get transport obfs4\" en el \ncuerpo del correo electrónico."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB mantiene una pequeña cantidad de bridges que no se distribuyen\nautomáticamente. En cambio, reservamos estos bridges para su distribución manual y\nlos entregamos a las ONG´s y otras organizaciones e individuos que necesitan\nbridges. Los bridges que se distribuyen a través del mecanismo \"Reserved\" pueden no\nver a los usuarios durante mucho tiempo. Ten en cuenta que el mecanismo de distribución \"Reserved\" se\ndenomina \"Unallocated\" en los archivos de %sasignación de agrupación de bridges.%s "
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "ninguno"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "BridgeDB no distribuye los bridges cuyo mecanismo de distribución es\"None\"\nEs responsabilidad del operador del bridge distribuir sus bridges a los\nusuarios. Ten en cuenta que en el Relay Search, el mecanismo de distribución de un bridge recién configurado\ndice \"None\" por hasta aproximadamente un dÃa. Se un poco paciente, y\nluego cambiará al mecanismo de distribución real del bridge.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Por favor seleccioná opciones para tipo de bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitás direcciones IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitás una %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no muestra las imágenes correctamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Ingresá los caracteres de la imagen..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Cómo comenzar a usar tus bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Para introducir puentes en tu Navegador Tor, primero andá hasta la %s página de descarga\ndel Navegador Tor %s y desde ahà seguà las instrucciones para descargar y ejecutar el Navegador Tor."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Primero, necesitas %sdescargar el Navegador Tor%s. Nuestro Manual de usuario del Navegador Tor\nexplica cómo puedes agregar tus puentes al Navegador Tor. Si estás\nutilizando Windows, Linux u OS X, %shaz clic aquÃ%s para obtener más información. Si estás\nutilizando Android, %shaz clic aquÃ%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Cuando el diálogo 'Configuración de Red de Tor' aparezca, cliqueá 'Configurar' y continuá con\nel asistente hasta que pregunte:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Agrega estos bridges a tu Navegador Tor abriendo las preferencias de tu navegador,\nhaciendo clic en \"Tor\" y luego agregándolos al campo \"Provide a\nbridge\"."
-#. 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 "¿Su Proveedor de Servicios de Internet (ISP) bloquea o de algún modo censura conexiones\na la red de Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicitar Tor bridges no ofuscados.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleccioná 'SÃ' y luego cliqueá 'Siguiente'. Para configurar tus nuevos bridges, copiá y\npegá las lÃneas de bridges en el cuadro de texto. Finalmente, cliqueá 'Conectar' y,\n¡eso deberÃa de ser todo! Si experimentás algún problema, intentá cliquear el botón 'Ayuda'\ndel asistente de 'Configuración de la Red de Tor' para recibir más asistencia."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Mostrar éste 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Pedir bridges ordinarios."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Pedir bridges IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pedir un Pluggable Transport por TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Solicitar bridges IPv6 .)"
-#. 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 "Obtener una copia de la clave pública GnuPG de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Solicita bridges obfs4 ofuscados)."
diff --git a/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po
index 233445c..1e7e95f 100644
--- a/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/es_MX/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Bernard Rodriguez <hey.bernard@xxxxxxxxx>, 2016
@@ -14,116 +14,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2017-09-20 00:56+0000\n"
-"Last-Translator: b39e6b72373066b02663de71fc788486\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Spanish (Mexico) (http://www.transifex.com/otf/torproject/language/es_MX/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: es_MX\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Perdón! Algo salió mal con tu petición."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lenguaje"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Reportar un error"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código fuente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registro de cambios"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar todo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para las entradas de tu(s) repetidores/puente(s)(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 "¡Oh, diantres!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Parece que hubo un error al obtener tu código QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 código QR contiene entradas de tus repetidores/puentes. Léelo con un lector de códigos QR para copiar las entradas de tus repetidores/puentes en tu teléfono móvil u otros dispositivos."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Actualmente no hay ningún repetidor/puente disponible..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Tal vez deberÃa intentar %s ir hacÃa atrás %s y seleccionar un tipo de repetidor/puente diferente."
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Descargar %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtener %s repetidores/puentes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
@@ -132,27 +147,27 @@ msgstr "Ahora %s agregar los repetidores/puents al Navegador Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "¡Sólo(%sJ%s) dame los repetidores/puentes!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opciones avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "¡SÃ(%sY%s)!"
@@ -160,69 +175,37 @@ msgstr "¡SÃ(%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "Obtener(%sG%s) repetidores/puentes"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "{Este es un mensage automático; por favor no lo conteste.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Aquà están tus puentes:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Has excedido el limite de envÃo. ¡Por favor pausa! El tiempo minimo entre\ncorreos electrónicos es %s horas. Todos los demás correos electrónicos durante este perÃodo serán ignorados."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "ORDENEs:(combina COMMANDs para especificar opciones multiples)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "¡Bienvenido a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TYPEs de transporte soportados actualmente:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "¡Eh, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "¡Hola, amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves Públicas"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este correo electrónico fue creado con arcoiris, unicornios y chispas\npara %s en %s en %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -233,7 +216,7 @@ msgid ""
msgstr "BridgeDB puede proveer repetidores/puentes con un gran %stipos de transportes conectables(Pluggable Transports)%s,\nlos cuales pueden ofuscar tus conexiones hacÃa la red de Tor, haciendo más\ndifÃcil para cualquiera que observe tu tráfico hacÃa Internet que estas\nusando Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -245,7 +228,7 @@ msgstr "Algunos puentes con direcciones IPv6 tambien estan disponibles, a traves
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -254,134 +237,169 @@ msgid ""
"\n"
msgstr "Adicionalmente, BridgeDB tiene muchos puentes de simple vainilla %s sin tener ningun transporte conectable %s lo cual podria no sonar tan genial, pero aun asi pueden ayudar con la censura de internet en muchos casos.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "¿Que son puentes?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Puentes %s son los relés que te ayudan a evitar las censuras"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "¡Necessito una forma alternativo de conectar con puentes!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Otro modo de consigir puentes es mandar un correo electronico a %s. Tenga en cuenta que debe enviar el correco electronico con dirección de uno de los siguientes proveedores de correo electrónico: %s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "¡Mis puentes no funcionan! ¡Necesito ayuda!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Si tu Tor no funciona, usted debe enviar por correo electrónico %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Intenta poner tanta informacion como puedas sobre tu problema, incluyendo una lista de los puentes y Pluggable Transports que hayas intentado usar, tu version de Tor Browser, y cualquier mensaje que Tor haya mostrado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Aqui estan tus puentes:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "¡Obten puentes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ninguno"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Por favor selecciona las opciones para tu tipo de puente:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "¿Necesitas direcciones IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "¿Necesitas un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Tu navegador no muestra las imagenes correctamente"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Ponga los caracteres de la imagen de arriba..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Como empezar a usar tus puentes."
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Para conectar puentes al Tor Browser; primero ve al %s Tor Browser pagina de descargas %s luego siga las instrucciones para descargar y empezar\nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Cuando la \"Configuración de Red Tor\" aparesca, presione \"Configurar y siguiente\nhasta que pregunte:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "¿Tu proveedor de servicios de internet (ISP) bloquea o censura las conecciones\na la red Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleccione \"Si\" luego presione \"Siguiente\".\nPara configurar sus nuevos puentes, copie y pegue\nlas lineas de los puentes en la caja de texto. Finalmente, presione \"Conectar\" y ¡deberias de estar listo para continuar! Si tienes problemas, prueba presionar en el botón de \"Ayuda\" en las \"configuraciones de red de Tor\" para mas asistencia."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Solicita un puente por defecto"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicita puentes IPv6"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicita un transporte enchufable por TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Obten una copia de la llave GnuPG deBridgeDB´s "
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po
index f984cde..94a0bc1 100644
--- a/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/et/LC_MESSAGES/bridgedb.po
@@ -1,126 +1,142 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Emma Peel, 2019
# G <purexxxx@xxxxxxxxxxx>, 2015
+# Madis Otenurm, 2020
# Mart Laub <mart@xxxxxxx>, 2014
# Paul Martin Korp <paul.m.korp@xxxxxxxxx>, 2018
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-04-30 10:46+0000\n"
-"Last-Translator: Emma Peel\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: et\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Vabandust! Midagi läks Teie päringuga valesti."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Teatage viga"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Lähtekood"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Muudatuste logi"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Vali kõik"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Näita QR-koodi"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "QR-koodi hankimisel ilmnes viga."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ã?htegi silda ei ole hetkel saadaval..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s samm."
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Lae alla %s Tor brauser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s samm."
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Hangi %s sillad %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s samm."
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nüüd %s lisa sillad Tor\\'i brauserisse%s"
@@ -129,27 +145,27 @@ msgstr "Nüüd %s lisa sillad Tor\\'i brauserisse%s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sL%sihtsalt anna mulle sillad!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Täpsemad seaded"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sah!"
@@ -157,69 +173,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sangi sillad"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[See on automatiseeritud teada - palun ärge sellele vastake.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Siin on sinu sillad:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Olete ületanud määra limiidi. Palun võtke aeglasemalt! Miinimum aeg e-mailide vahel\non %s tundi. Edasiseid e-maile selles ajavahemikus ignoreeritakse."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "K�SUD: (kombineeri K�SUD, et täpsustada valikuid üheaegselt)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Tere tulemast BridgeDB-sse!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Hetkel toetatud transport TYPE\\'id"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Tervist, sõber!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "See e-mail loodi vikerkaarte, ükssarvikute ja sädemetega\n%s -le, %s kell %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +214,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -242,7 +226,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +235,169 @@ msgid ""
"\n"
msgstr "Lisaks on BridgeDB-l ka palju tavapäraseid, igavaid sildu %s ilma\nPluggable Transports-ideta %s, mis võib-olla ei kõla nii lahedalt, kuid need sillad saavad teil paljudel juhtul internetitsensuuri eest kõrvale põigata.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Mis on sillad?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Sillad %s on Tor-i releed, mis aitavad internetitsensuuri eest kõrvale põigata."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Mul on vaja teist viisi sildade saamiseks!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Sildu on võimalik saada ka saates e-maili järgnevale aadressile: %s. Palun pange\ntähele, et peate saatma e-maili selliselt aadressilt, mis kasutab ühte järgnevatest e-maili teenusepakkujatest:\n%s, %s või %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Mu sillad ei tööta! Vajan abi!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Kui Teil Tor ei tööta, saatke e-mail aadressile %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Proovige lisada võimalikult palju informatsioon seoses oma juhtumiga, lisades järjendi sildadest ja\nPluggable Transports\\'idest, mida Te üritasite kasutada; oma Tor brauseri versioon\nja kõik teated, mida Tor sulle edastas jne."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Siin on teie silla read:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
-msgstr "Hangi sillad!"
+msgstr "Hangi sildasid!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Silla levitamise vahendid"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "puudub"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Palun valige silla tüüp:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Kas teil on vaja IPv6 aadresse?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Kas teil on vaja %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Teie veebilehitseja ei kuva pilte korrektselt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Sisestage ülemisel pildil olevad sümbolid..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Kuidas alustada oma sildade kasutamist"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Et lisada sildu Tor\\'i brauserisse, minge %s Tor\\'i brauseri allalaadimisleheküljele %s ja järgige seal olevaid instruktsioone Tor brauseri allalaadimiseks ja käivitamiseks."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Kui 'Tor\\'i võrgu seaded' dialoog kerkib esile, vajutage 'Seadista' ja järgige nõustajat kuni see küsib:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Kas Teie Internetiteenuse pakkuja (ISP) blokeerib või tsensoreerib ühendusi Tor\\'i võrku?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Valige \"Jah\" ja klikkige \"Järgmine\". Et seadistada oma uusi sildu, kopeeri ja kleebi silla read teksti sisendikasti. Lõpetuseks vajutage \"�henda\", ja kõik peaks toimima! Kui Teil tekib probleeme, proovige klikkida \"Abi\" nuppu, mis asub \"Tor\\'i võrgu seaded\" nõustajas edasise abi saamiseks."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Näitab 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Esita päring tavaliste sildade jaoks."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Esita päring IPv6 sildade jaoks."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Esita päring Pluggable Transpordi jaoks TYPE järgi."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Hangi koopia BridgeDB GnuPG avalikust võtmest."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po
index e6e956c..3e7ab1c 100644
--- a/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/eu/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,406 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Antxon Baldarra <baldarra@xxxxxxxxxxx>, 2013
-# Antxon Baldarra <baldarra@xxxxxxxxxxx>, 2011, 2012
+# baldarra, 2013
+# Aritz Jorge Sánchez <aritz.jorge@xxxxxxxxxxxxxx>, 2015
+# baldarra, 2011, 2012
+# David GarcÃa-Abad <dgarciabad@xxxxxxxxx>, 2018
+# Egoitz Rodriguez <egoitzro@xxxxxxxxx>, 2014
+# Eneko, 2015
+# javikitz <javikitz@xxxxxxxxxxxxxx>, 2015
+# Osoitz <oelkoro@xxxxxxxxx>, 2019
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-05-09 15:19+0000\n"
-"Last-Translator: Antxon Baldarra <baldarra@xxxxxxxxxxx>\n"
-"Language-Team: Basque (http://www.transifex.com/projects/p/torproject/language/eu/)\n"
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Basque (http://www.transifex.com/otf/torproject/language/eu/)\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 2.8.0\n"
"Language: eu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-#: lib/bridgedb/templates/base.html:33
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Barkatu! Zerbait gaizki joan da zure eskaeran."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Eman errore baten berri"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Iturburu-kodea"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Changelog-a"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Hautatu dena"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Erakutsi QR Kodea"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR kodea zubi-lerroentzarako"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Akats bat egon da zure QR kodea lortzen."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+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 kode hau zure zubi-lerroak dauzka. Eskaneatu QR kode irakurle batekin kopiatzeko mugikorrean edo beste gailutan."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Momentuz ez daude zubirik..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Agian saiatu %s atzera itzuli %s eta beste zubi mota bat aukeratzen!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1.%s urratsa"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Jaitsi %s Tor Nabigatzailea %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2.%s urratsa"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Eskuratu %s zubiak %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3.%s urratsa"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Orain %s gehitu zubiak Torera %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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust emaidazu zubiak!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Aukera Aurreratuak"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ez"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Bat ere ez."
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sB%sai!"
+
+#. TRANSLATORS: Please make sure the '%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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Hona hemen zure zubiak:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Pasatu zara denbora-mugatik. Mesedez, motela-behera! Gutxienezko denbora dago\nemails %s ordutan. Email guztiak denbora-periodo horretan baztertuko dira."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Zer dira zubiak?"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/strings.py:79
#, python-format
-msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s zubi erreleak zentsura sahiesten laguntzen zaituzten %s Tor erreleak dira."
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Zubiak eskuratzeko modu alternatibo bat behar dut!"
-#: lib/bridgedb/templates/base.html:40
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "Zubi publikoen helbideak aurkitzeko beste modu bat eposta (%s edo %s helbide batetik) bat bidaltzea da %sera 'get bridges' lerroarekin mezuaren gorputzean bertan."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Nire zubiak ez dute funtzionatzen! Laguntza behar dut!"
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "Zure Torek funtzionatzen ez badu, %sera email bat idatzi beharko zenuke. Saiatu zure kasuaren inguruan ahalik eta informazio gehien sartzen, erabili dituzun zubien zerrenda, erabili duzun bundlearen fitxategi izena/bertsioa, Torek eman dizkizun mezuak, eta abar barne."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:10
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Zubiak Lortu!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr "Gaineko lerroak erabiltzeko, joan zaitez Vidaliaren sare ezarpenenak orrira, eta sakatu \"Nire Internet Zerbitzu Hornitzaileak Tor sarera konektatzea blokeatzen dit\". Ondoren gehitu ezazu zubi helbide bakoitza banan banan."
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "Ez dago zubirik eskuragarri oraintxe bertan."
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "Berritu zure nabigatzailea Firefoxera"
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "Idatzi itzazu bi hitzak"
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "1. pausua"
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:130
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "Eskuratu %s Tor Browser Bundlea %s"
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "2. pausua"
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Bat ere ez"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
-#: lib/bridgedb/templates/index.html:15
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "IPv6 helbideak behar dituzu?"
+
+#: bridgedb/strings.py:150
#, python-format
-msgid "Get %s bridges %s"
-msgstr "Eskuratu %s zubiak %s"
+msgid "Do you need a %s?"
+msgstr "%s behar duzu?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "Zure nabigatzaileak ez ditu irudiak behar bezala erakusten."
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "3. pausua"
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "Sartu goiko irudiko karaktereak..."
-#: lib/bridgedb/templates/index.html:21
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "Nola hasi zure zubiak erabiltzen"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "Orain %s gehitu zubiak Torera %s"
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
index e2b03a0..30376d4 100644
--- a/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fa/LC_MESSAGES/bridgedb.po
@@ -1,15 +1,16 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# arashaalaei <aalaeiarash@xxxxxxxxx>, 2011
+# Ali A, 2019
# signal89, 2014
# Amir Moezzi <amirreza.mz@xxxxxxxxx>, 2017
# ardeshir, 2013
# Ehsan Ab <a.ehsan70@xxxxxxxxx>, 2015
# NoProfile, 2014-2015
+# Hamid reza Zaefarani, 2019-2020
# johnholzer <johnholtzer123@xxxxxxxxx>, 2014
# Mehrad Rousta <mehrad77@xxxxxxxxx>, 2018
# Mohammad Hossein <desmati@xxxxxxxxx>, 2014
@@ -17,149 +18,166 @@
# perspolis <rezarms@xxxxxxxxx>, 2011
# masoudd <relive.mn@xxxxxxxxx>, 2018
# Setareh <setareh.salehee@xxxxxxxxx>, 2014
+# Seyyed Hossein Darvari <xhdix@xxxxxxxxx>, 2020
+# Vox, 2020
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-08-17 08:33+0000\n"
-"Last-Translator: MYZJ\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 15:15+0000\n"
+"Last-Translator: Seyyed Hossein Darvari <xhdix@xxxxxxxxx>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: fa\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ù?تاسÙ?اÙ?Ù? در رابطÙ? با درخÙ?است Ø´Ù?ا خطاÛ?Û? رخ دادÙ? است."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "زباÙ?"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
-msgstr "گزارش Û?Ú© باگ"
+msgstr "گزارش اشکاÙ? در برÙ?اÙ?Ù?"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "کد Ù?Ù?بع"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ù?Û?ست تغÛ?Û?رات"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "تÙ?اس"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "اÙ?تخاب Ù?Ù?Ù?"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ù?Ù?اÛ?Ø´ QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "بÙ? Ù?ظر Ù?Û? رسد در درÛ?اÙ?ت QRCode براÛ? Ø´Ù?اØ? خطا Ù?جÙ?د داشت."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB با خطاÛ?Û? رÙ?برÙ? شد."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ù?Ù?â??اکÙ?Ù?Ù? Ù?Û?Ú? Ù¾Ù?Û? در دسترس Ù?Û?ست..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Ù?رØÙ?Ù? %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
-msgstr "داÙ?Ù?Ù?د %s Ù?رÙ?رگر تÙ?ر %s"
+msgstr "داÙ?Ù?Ù?د %s Ù?رÙ?رگر Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Ù?رØÙ?Ù? %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "درÛ?اÙ?ت %s Ù¾Ù?â?? Ù?ا %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Ù?رØÙ?Ù? %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "اکÙ?Ù?Ù?Ø? %s اÙ?زÙ?دÙ? Ù¾Ù? Ù?ا بÙ? Ù?رÙ?رگر تÙ?ر %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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sÙ?%sÙ?Ø· Ù¾Ù? Ù?ا را بÙ?Ù? بدÙ?!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
-msgstr "گزÛ?Ù?Ù?â??Ù?اÛ? Ù¾Û?شرÙ?تÙ?"
+msgstr "تÙ?ظÛ?Ù?ات Ù¾Û?شرÙ?تÙ?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ù?Ù?"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "Ù?Û?Ú?"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sب%sÙ?Ù?!"
@@ -167,69 +185,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sد%sرÛ?اÙ?ت Ù¾Ù?â??Ù?ا"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[اÛ?Ù? Û?Ú© Ù¾Û?اÙ? Ø®Ù?دکار Ù?Û?â??باشدØ? Ù?Ø·Ù?ا پاسخ Ù?دÙ?Û?د.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[اÛ?Ù? Û?Ú© اÛ?Ù?Û?Ù? Ø®Ù?دکار Ù?Û?â??باشد.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ù?Ù?رست Ù¾Ù?â??Ù?اÛ? Ø´Ù?ا:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 ساعت است. تÙ?اÙ?Û? اÛ?Ù?Û?Ù? Ù?اÛ? بعدÛ? در اÛ?Ù? بازÙ?â??Û? زÙ?اÙ?Û?Ø? Ù?ادÛ?دÙ? گرÙ?تÙ? Ù?Û? Ø´Ù?Ù?د."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "دستÙ?رات: (براÛ? Ù?شخص کردÙ? Ú?Ù?دÛ?Ù? گزÛ?Ù?Ù? بÙ? Ø·Ù?ر Ù?Ù?زÙ?اÙ?Ø? دستÙ?رات را با Ù?Ù? ترکÛ?ب Ú©Ù?Û?د)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "بÙ? BridgeDB Ø®Ù?Ø´â??Ø¢Ù?دÛ?د!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "در ØاÙ? ØاضرØ? از اÛ?Ù? transport TYPE Ù?ا پشتÛ?باÙ?Û? Ù?Û? Ø´Ù?د:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "سÙ?اÙ?Ø? %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "سÙ?اÙ? دÙ?ست Ù?Ù?!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "اÛ?Ù? اÛ?Ù?Û?Ù? بÙ? Ø·Ù?ر Ø®Ù?دکار بÙ?سÛ?Ù?Ù? rainbowsØ? unicorns Ù? sparkles \n براÛ?%s بر %s در %s تÙ?Ù?Û?د شدÙ? است."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "اگر اÛ?Ù? Ù¾Ù?â??Ù?ا Ø¢Ù? Ú?Û?زÛ? Ù?Û?ستÙ?د Ú©Ù? Ø´Ù?ا Ù?Û?از دارÛ?دØ? با Û?Ú©Û? از دستÙ?رات زÛ?ر در Ù?تÙ? Ù¾Û?اÙ?Ø? بÙ? اÛ?Ù? اÛ?Ù?Û?Ù? پاسخ دÙ?Û?د:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -237,10 +223,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB Ù?Û? تÙ?اÙ?د Ù¾Ù? Ù?اÛ?Û? با Ú?Ù?دÛ?Ù? %sÙ?Ù?ع Ù?تعدد از Pluggable Transports%s Ù?راÙ?Ù? Ú©Ù?دØ?\n Ú©Ù? Ú©Ù?Ú© Ù?Û? Ú©Ù?د اتصاÙ? Ø´Ù?ا بÙ? شبکÙ? Tor تا Øد اÙ?کاÙ? Ù?بÙ?Ù? Ù? Ù?اشÙ?اس باÙ?Û? بÙ?اÙ?د.\n با اÛ?Ù? کارØ? اÙ?رادÛ? Ú©Ù? بر تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت Ø´Ù?ا Ù?ظارت Ù?Û? Ú©Ù?Ù?دØ? بÙ? سختÛ? Ù?Û? تÙ?اÙ?Ù?د تشخÛ?ص دÙ?Ù?د Ú©Ù? Ø´Ù?ا بÙ? تÙ?ر Ù?صÙ? شدÙ? اÛ?د.\n"
+msgstr "BridgeDB Ù?Û? تÙ?اÙ?د Ù¾Ù? Ù?اÛ?Û? با Ú?Ù?دÛ?Ù? %sÙ?Ù?ع Ù?تعدد از Pluggable Transports%s Ù?راÙ?Ù? Ú©Ù?دØ?\n Ú©Ù? Ú©Ù?Ú© Ù?Û? Ú©Ù?د اتصاÙ? Ø´Ù?ا بÙ? شبکÙ? Tor تا Øد اÙ?کاÙ? Ù?بÙ?Ù? Ù? Ù?اشÙ?اس باÙ?Û? بÙ?اÙ?د.\n با اÛ?Ù? کارØ? اÙ?رادÛ? Ú©Ù? بر تراÙ?Û?Ú© اÛ?Ù?ترÙ?ت Ø´Ù?ا Ù?ظارت Ù?Û? Ú©Ù?Ù?دØ? بÙ? سختÛ? Ù?Û? تÙ?اÙ?Ù?د تشخÛ?ص دÙ?Ù?د Ú©Ù? Ø´Ù?ا بÙ? Tor Ù?صÙ? شدÙ? اÛ?د.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -252,7 +238,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -261,134 +247,169 @@ msgid ""
"\n"
msgstr "Ù?Ù?Ú?Ù?Û?Ù? BridgeDB شاÙ?Ù? تعداد زÛ?ادÛ? Ù¾Ù? Ù?اÛ? ابتداÛ?Û? Ù? Ù?دÛ?Ù?Û? است Ú©Ù? %s Pluggable Transports Ù?دارÙ?د %s Ù? Ù?Ù?Ú©Ù? است بÛ? Ù?صرÙ? بÙ? Ù?ظر برسÙ?د اÙ?ا Ù?Ù?Ú?Ù?اÙ? Ù?Ù?Ú©Ù? است در Ù?Ù?ارد Ù?تعددÛ? جÙ?ت دÙ?ر زدÙ? Ù?Û?Ù?ترÛ?Ù?Ú¯ بÙ? Ø´Ù?ا Ú©Ù?Ú© Ú©Ù?Ù?د.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ù¾Ù? Ù?ا Ú?Ù? Ù?ستÙ?دØ?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Ù¾Ù? Ù?ا %s Ù?ستÙ?د بازپخش Ú©Ù?Ù?دÙ? Ù?اÛ? تÙ?ر Ù?ستÙ?د Ú©Ù? بÙ? Ø´Ù?ا براÛ? دÙ?ر زدÙ? ساÙ?سÙ?رکÙ?Ú© Ù?Û? Ú©Ù?Ù?د ."
+msgstr "%s Ù¾Ù? Ù?ا %s Ù?ستÙ?د بازپخش Ú©Ù?Ù?دÙ? Ù?اÛ? Tor Ù?ستÙ?د Ú©Ù? بÙ? Ø´Ù?ا براÛ? دÙ?ر زدÙ? ساÙ?سÙ?ر Ú©Ù?Ú© Ù?Û? Ú©Ù?Ù?د ."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "بÙ? Û?Ú© راÙ? دÛ?گر براÛ? درÛ?اÙ?ت bridge Ù?ا اØتÛ?اج دارÙ?!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 ."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Û?Ú© راÙ? دÛ?گر براÛ? درÛ?اÙ?ت Ù¾Ù? Ù?اØ? Ù?رستادÙ? اÛ?Ù?Û?Ù? بÙ? %s است. \nعÙ?Ù?اÙ? را خاÙ?Û? بگذارÛ?د Ù? در Ù?تÙ? Ù¾Û?اÙ? \"get transport obfs4\" بÙ?Ù?Û?سÛ?د. \nÙ?Ø·Ù?ا تÙ?جÙ? داشتÙ? باشÛ?د Ú©Ù? Ø´Ù?ا باÛ?د اÛ?Ù?Û?Ù? را از طرÛ?Ù? Û?Ú©Û? از سرÙ?Û?س دÙ?Ù?دÙ? Ù?اÛ? \nاÛ?Ù?Û?Ù? %s Û?ا %s ارساÙ? Ú©Ù?Û?د."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "بÙ? Ú©Ù?Ú© اØتÛ?اج دارÙ?! Ù¾Ù?â??Ù?اÛ? Ù?Ù? کار Ù?Ù?Û?â??Ú©Ù?Ù?د!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "اگر تÙ?ر Ø´Ù?ا کار Ù?Ù?Û? Ú©Ù?د, Ø´Ù?ا باÛ?د اÛ?Ù?Û?Ù? Ú©Ù?Û?د %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 بÙ? Ø´Ù?ا دادÙ? است."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "اگر Ù?رÙ?رگر Tor Ø´Ù?ا Ù?ادر بÙ? اتصاÙ? Ù?Û?ست Ø? Ù?Ø·Ù?اÙ? بÙ? %s Ù? %s Ù?ا Ù?گاÙ?Û? بÛ?Ù?دازÛ?د."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "خطÙ?Ø· Ù¾Ù? Ø´Ù?ا در اÛ?Ù?جا:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "درÛ?اÙ?ت Ù¾Ù?â??Ù?ا!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ù?کاÙ?Û?زÙ?â??Ù?اÛ? تÙ?زÛ?ع Bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB از Ú?Ù?ار Ù?کاÙ?Û?زÙ? براÛ? تÙ?زÛ?ع Ù¾Ù?â??Ù?ا استÙ?ادÙ? Ù?Û?â??Ú©Ù?د: \"HTTPS\"Ø? \"MoatØ?\n \"اÛ?Ù?Û?Ù?\" Ù? \"رزرÙ?\". Ù¾Ù?â??Ù?اÛ?Û? Ú©Ù? از طرÛ?Ù? BridgeDB تÙ?زÛ?ع Ù?Ù?Û?â??Ø´Ù?Ù?دØ?\nاز شبÙ? Ù?کاÙ?Û?زÙ? \"None\" استÙ?ادÙ? Ù?Û?â??Ú©Ù?Ù?د. Ù?Û?ست زÛ?ر بÙ? صÙ?رت Ø®Ù?اصÙ? تÙ?ضÛ?Ø Ù?Û?â??دÙ?د\nÚ©Ù? Ù?ر کداÙ? از اÛ?Ù? Ù?کاÙ?Û?زÙ?â??Ù?ا Ú?Ø·Ù?ر کار Ù?Û?â??Ú©Ù?Ù?د Ù? %sÙ?عÛ?ارÙ?اÛ? BridgeDB%s Ù?ØبÙ?بÛ?ت Ù?رکداÙ?\nاز Ù?کاÙ?Û?زÙ?â??Ù?ا را Ù?شاÙ? Ù?Û?â??دÙ?د."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Ù?کاÙ?Û?زÙ? تÙ?زÛ?ع \"HTTPS\" Ù¾Ù?â??Ù?ا را از طرÛ?Ù? اÛ?Ù? Ù?بساÛ?ت ارائÙ? Ù?Û?â??Ú©Ù?د. براÛ? \nدرÛ?اÙ?ت Ù¾Ù?â??Ù?ا بÙ? %sbridges.torproject.org%s رÙ?تÙ?Ø? گزÛ?Ù?Ù?â??Û? Ù?د Ù?ظر Ø®Ù?د را اÙ?تخاب کردÙ? Ù? کد CAPTCHA را ØÙ? Ú©Ù?Û?د."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Ù?کاÙ?Û?زÙ? تÙ?زÛ?ع \"Moat\" بخشÛ? از Ù?رÙ?رگر تÙ?ر است Ú©Ù? بÙ? کاربراÙ? اجازÙ? Ù?Û?â??دÙ?د\nÚ©Ù? Ù¾Ù?â??Ù?ا را از داخÙ? تÙ?ظÛ?Ù?ات Ù?رÙ?رگر تÙ?ر درخÙ?است دÙ?Ù?د. براÛ? درÛ?اÙ?ت Ù¾Ù?â??Ù?ا بÙ?\n%sتÙ?ظÛ?Ù?ات تÙ?ر%s Ù?رÙ?رگر تÙ?ر Ø®Ù?د رÙ?تÙ?Ø? بر رÙ?Û? \"درخÙ?است Ù¾Ù? جدÛ?د\" Ú©Ù?Û?Ú© Ù? کد CAPTCHA\nرا ØÙ? Ú©Ù?Û?د. Ù?رÙ?رگر تÙ?ر بÙ? صÙ?رت Ø®Ù?دکار Ù¾Ù? جدÛ?د را\nاضاÙ?Ù? Ø®Ù?اÙ?د کرد."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "کاربراÙ? Ù?Û?â??تÙ?اÙ?Ù?د با Ù?کاÙ?Û?زÙ? تÙ?زÛ?ع \"اÛ?Ù?Û?Ù?\" درخÙ?است Ù¾Ù? دÙ?Ù?د. براÛ? اÛ?Ù? کار بÙ?\n%sbridges@xxxxxxxxxxxxxx%s اÛ?Ù?Û?Ù? دادÙ? Ù? بÙ? عÙ?Ù?اÙ? Ù?تÙ? اÛ?Ù?Û?Ù? عبارت\nget transport obfs4\" را بÙ?Ù?Û?سÛ?د."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "رزرÙ? شدÙ?"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB شاÙ?Ù? تعداد Ú©Ù?Û? از Ù¾Ù?â??Ù?اÛ?Û? است Ú©Ù? بÙ? صÙ?رت Ø®Ù?دکار تÙ?زÛ?ع Ù?Ù?Û?â??گردÙ?د.\nبÙ?Ú©Ù? Ù?ا اÛ?Ù? Ù¾Ù?â??Ù?ا را براÛ? تÙ?زÛ?ع دستÛ? رزرÙ? کردÙ? Ù?\nتØÙ?Û?Ù? NGOÙ?ا Ù? ساÛ?ر Ù?Ù?ادÙ?ا Ù? اÙ?رادÛ? Ú©Ù? Ù?Û?از بÙ? Ø¢Ù? دارÙ?د\nÙ?Û?â??دÙ?Û?Ù?. Ù¾Ù?â??Ù?اÛ?Û? Ú©Ù? با Ù?کاÙ?Û?زÙ? \"رزرÙ?\" تÙ?زÛ?ع Ù?Û?â??گردÙ?د Ù?Ù?Ú©Ù? است تا\nÙ?دت Ø·Ù?Ù?اÙ?Û? استÙ?ادÙ? Ù?گردÙ?د. در Ù?ظر داشتÙ? باشÛ?د Ú©Ù? Ù?کاÙ?Û?ز تÙ?زÛ?ع \"رزرÙ?\" در Ù?اÛ?Ù? %sÙ?خزÙ? Ù?اگذارÛ? Ù¾Ù?%s با Ù?اÙ? \"تخصÛ?ص Ù?Û?اÙ?تÙ?\" Ø´Ù?اختÙ? Ù?Û?â??Ø´Ù?د."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ù?Û?Ú?"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Ù¾Ù? Ù?اÛ?Û? Ú©Ù? Ù?کاÙ?Û?سÙ? تÙ?زÛ?ع Ø¢Ù?Ù?ا \"Ù?Û?Ú?\" است تÙ?سط BridgeDB تÙ?زÛ?ع Ù?Ù?Û? Ø´Ù?Ù?د.\nاÛ?Ù? Ù?ظÛ?Ù?Ù? اپراتÙ?ر Ù¾Ù? است Ú©Ù? بتÙ?اÙ?د Ù¾Ù?â??Ù?اÛ? Ø®Ù?د را براÛ? کاربراÙ? تÙ?زÛ?ع Ú©Ù?د. تÙ?جÙ? داشتÙ? باشÛ?د Ú©Ù? در جستجÙ?Û? رÙ?Ù?Ø? سازâ??Ù?â??کار تÙ?زÛ?ع Û?Ú© Ù¾Ù? تازÙ? Ù?صب شدÙ? Øداکثر تا ØدÙ?د Û?Ú© رÙ?ز \"Ù?Û?Ú?\" Ø®Ù?اÙ?د بÙ?د.\n Ú©Ù?Û? صبÙ?ر باشÛ?دØ? Ù?ضعÛ?ت Ø¢Ù? بÙ? سازâ??Ù?کار تÙ?زÛ?ع Ù?اÙ?عÛ? Ù¾Ù? تغÛ?Û?ر Ø®Ù?اÙ?د کرد.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ù?Ø·Ù?ا گزÛ?Ù?Ù? Ù?Ù?ع Ù¾Ù? را اÙ?تخاب Ú©Ù?Û?د:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ø¢Û?ا Ø´Ù?ا بÙ? آدرس Ù?اÛ? IPv6 Ù?Û?از دارÛ?دØ?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ø¢Û?ا Ø´Ù?ا Ù?Û?از دارÛ?د بÙ? Û?Ú© %sØ?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ù?رÙ?رگر Ø´Ù?ا تصاÙ?Û?ر را بÙ? درستÛ? Ù?Ù?اÛ?Ø´ Ù?Ù?Û? دÙ?د."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "کاراکتر Ù?ا را از تصÙ?Û?ر باÙ?ا Ù?ارد Ú©Ù?Û?د..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ú?Ú¯Ù?Ù?Ú¯Û? از Ù¾Ù?â??Ù?اÛ? Ø®Ù?د استÙ?ادÙ? Ú©Ù?Û?د"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "براÛ? Ù?رÙ?د بÙ? Ù¾Ù? در Ù?رÙ?رگر Tor Ø? براÛ? اÙ?Ù?Û?Ù? بار %s بÙ? داÙ?Ù?Ù?د Ù?رÙ?رگر Tor \nصÙ?ØÙ? %s Ù? پس از Ø¢Ù? بÙ? دÙ?باÙ? دستÙ?راÙ?عÙ?Ù? داÙ?Ù?Ù?د Ù? استÙ?ادÙ? از\nÙ?رÙ?رگر Tor برÙ?Û?د."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "ابتداØ? Ø´Ù?ا Ù?Û?از بÙ? %sبارگÛ?رÛ? Ù?رÙ?رâ??گر تÙ?ر%s دارÛ?د. دÙ?ترÚ?Ù? راÙ?Ù?Ù?ا Ù?رÙ?رگر Tor Ù?اØ? تÙ?ضÛ?Ø Ù?Û?â??دÙ?د Ú©Ù? Ú?Ú¯Ù?Ù?Ù? Ù?Û?â??تÙ?اÙ?Û?د Ù¾Ù?â??Ù?اÛ? Ø®Ù?د را بÙ? Ù?رÙ?رگر Tor اضاÙ?Ù? Ú©Ù?Û?د\nاگر Ø´Ù?ا از Ù?Û?Ù?دÙ?زØ? Ù?Û?Ù?Ù?کس Û?ا Ù?Ú© استÙ?ادÙ? Ù?Û?â??Ú©Ù?Û?دØ? براÛ? اطÙ?اعات بÛ?شتر %s اÛ?Ù?جا Ú©Ù?Û?Ú© Ú©Ù?Û?د%s. اگر Ø´Ù?ا  از اÙ?درÙ?Û?د استÙ?ادÙ? Ù?Û?â??کتÛ?دØ?%sاÛ?Ù?جا Ú©Ù?Û?Ú© Ú©Ù?Û?د%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ù?Ù?تÛ? Ú©Ù? صÙ?ØÙ? 'تÙ?ظÛ?Ù?ات شبکÙ? تÙ?ر' Ù?Ù?اÛ?Ø´ دادÙ? شد, رÙ?Û? گزÛ?Ù?Ù? 'Ù¾Û?کربÙ?دÛ?' Ú©Ù?Û?Ú© Ú©Ù?Û?د Ù? دÙ?باÙ? Ú©Ù?Û?د\nتا زÙ?اÙ?Û? Ú©Ù? wizard از Ø´Ù?ا بپرسد:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "اÛ?Ù? Ù¾Ù?â??Ù?ا را بÙ? Ù?رÙ?رگر تÙ?ر Ø®Ù?دØ? با باز کردÙ? تÙ?ظÛ?Ù?ات Ù?رÙ?رگرØ? Ú©Ù?Û?Ú© بر رÙ?Û? \"Tor\"Ø? Ù? سپس اضاÙ?Ù? کردÙ? Ø¢Ù?Ù?ا بÙ? بخش \"ارائÙ? Û?Ú© Ù¾Ù?\"Ø? اضاÙ?Ù? Ú©Ù?Û?د."
-#. 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 "Ø¢Û?ا شرکت اراÛ?Ù? دÙ?Ù?دÙ? اÛ?Ù?ترÙ?ت (ISP) Ø´Ù?ا بÙ?اک Ù?Û? Ú©Ù?د Ù? Û?ا ساÙ?سÙ?ر Ù?Û? Ú©Ù?د ارتباطات\nشبکÙ? تÙ?ر Ø´Ù?ا راØ?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(درخÙ?است Ù¾Ù?â??Ù?اÛ? تÙ?ر Ù?اâ??Ù?بÙ?Ù?.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'بÙ?Ù?' را اÙ?تخاب کردÙ? Ù? سپس 'بعدÛ?' را اÙ?تخاب Ú©Ù?Û?د. براÛ? Ù¾Û?کربÙ?دÛ? Ù¾Ù? جدÛ?د Ø®Ù?د, copy Ù? paste Ú©Ù?Û?د خطÙ?Ø· Ù¾Ù? را در Ù?تÙ? جعبÙ? Ù?رÙ?دÛ?. در Ù?Ù?اÛ?ت, رÙ?Û? 'اتصاÙ?' Ú©Ù?Û?Ú© Ú©Ù?Û?د,\nراÙ? درستش اÛ?Ù? است! اگر Ù?Ø´Ú©Ù?Û? Ù¾Û?Ø´ Ø¢Ù?د, Ú©Ù?Û?Ú© Ú©Ù?Û?د رÙ?Û? Ú©Ù?Û?د 'راÙ?Ù?Ù?ا'\nدر 'تÙ?ظÛ?Ù?ات شبکÙ? تÙ?ر' wizard براÛ? اطÙ?اعات بÛ?شتر."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "درخÙ?است Ù¾Ù?â??Ù?اÛ? عادÛ?"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "درخÙ?است Ù¾Ù?â??Ù?اÛ? IPv6"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "درخÙ?است Û?Ú© رÙ?Ø´ Transport جاÛ?گزÛ?Ù? براساس TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr "(درخÙ?است Ù¾Ù?â??Ù?اÛ? IPv6.)"
-#. 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 "درÛ?اÙ?ت Û?Ú© رÙ?Ù?Ù?شت از Ú©Ù?Û?دÙ? GnuPG عÙ?Ù?Ù?Û?Ù? BridgeDB"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(درخÙ?است Ù¾Ù?â??Ù?اÛ? Ù?بÙ?Ù? obfs4.)"
diff --git a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
index 73a05e2..7aad3f5 100644
--- a/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fi/LC_MESSAGES/bridgedb.po
@@ -1,13 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Hessu Lumberi <pitkahessu@xxxxxxxxxxx>, 2015
# Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2015
# Jorma Karvonen <karvonen.jorma@xxxxxxxxx>, 2014
# Spacha <miikasikala96@xxxxxxxxx>, 2015
-# Ossi Kallunki <ossikallunki@xxxxxxxxx>, 2013
+# Ossi K, 2013
# Pietu1998 <smiley@xxxxxxxxxxxxx>, 2016
# Riku Viitanen <riisseli4@xxxxxxxxx>, 2015
# Sami Kuusisto <sami@xxxxxxxx>, 2014
@@ -18,116 +18,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Finnish (http://www.transifex.com/otf/torproject/language/fi/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: fi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Pyyntösi epäonnistui jostain syystä."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Kieli"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ilmoita ohjelmointivirheestä"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Lähdekoodi"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Muutosloki"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Yhteystieto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Valitse kaikki"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Näytä QR-koodi"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Siltariviesi QR-koodi"
-#. 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 "Jossain on pulma!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Tapahtui virhe QR-koodia noudettassa."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Tämä QR-koodi sisältää siltarivisi. Skannaa se QR-koodinlukijalla kopioidaksesi siltarivit matkapuhelimeesi ja muihin laitteisiin."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Tällä hetkellä ei ole yhtään siltaa saatavilla..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Ehkä sinun pitäisi yrittää %s palaamalla %s ja valitsemalla eri siltatyyppi!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Vaihe %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Lataa %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Vaihe %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Hanki %s sillat %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Vaihe %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nyt %s lisää sillat Tor Browseriin %s"
@@ -136,27 +151,27 @@ msgstr "Nyt %s lisää sillat Tor Browseriin %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sA%snna minulle vain sillat!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Lisävalitsimet"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ei mitään"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sK%syllä!"
@@ -164,69 +179,37 @@ msgstr "%sK%syllä!"
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sae sillat"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Tämä on automaattinen viesti; älä vastaa tähän.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Tässä ovat sinun siltasi."
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Olet ylittänyt nopeusrajan. Hidasta hiukan! Minimiaika viestien välillä on %s tunnissa. Kaikki lisäviestit tämän ajan kuluessa ohitetaan."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMENNOT: (yhdistä KOMENNOT määritelläksesi useita valitsimia samanaikaisesti)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Tervetuloa BridgeDB :hen!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Nykyiset tuetut transport TYPE-siirtotyypit:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hei ystävä!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Julkiset avaimet"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Tämä sähköposti tuotettiin käyttäjälle %s %s klo %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -237,7 +220,7 @@ msgid ""
msgstr "BridgeDB voi tarjota usean %styyppisiä irrotettavia Pluggable Transports%s-siirtoja,\njotka voivat auttaa peittämään yhteytesi Tor Network-verkkoon, mikä tekee vaikeammaksi\nkenellekään seurata internet-liikennettäsi ottaakseen selvää, että käytätkö Tor-palvelua.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -249,7 +232,7 @@ msgstr "Myös joitakin siltoja IPv6-osoitteilla on saatavilla, vaikka jotkut irr
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -258,134 +241,169 @@ msgid ""
"\n"
msgstr "Lisäksi BridgeDB:llä on useita tavallisia siltoja %s ilman mitään irrotettavia\nPluggable Transports %s-siirtoja, jotka eivät ehkä kuulosta herkullisilta, mutta\nne voivat silti auttaa monissa tapauksissa kiertämään internet-sensuuria.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Mitä ovat sillat?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s-sillat %s ovat Tor-välitysjärjestelmiä, jotka auttavat kiertämään sensurointia."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Tarvitsen vaihtoehtoisen tavan tavoittaa sillat!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Toinen tapa siltojen hankkimiseen on lähettää sähköpostia osoitteeseen %s. Huomaa,\nettä sinun on lähetettävä sähköpostiviesti käyttäen yhtä seuraavien sähköpostitarjoajien\nosoitetta:\n%s, %s tai %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Siltani eivät toimi! Tarvitsen apua!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jos Tor ei toimi sinulla, sinun pitäisi sähköpostittaa %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Yritä sisällyttää niin paljon tietoa tapauksestasi kuin voit, mukaanlukien siltojen\nluettelo ja irrotettavat Pluggable Transport-siirrot, joita yritit käyttää,\nTor Browser-versio, ja kaikki viestit, jotka Tor ilmoitti, jne."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Tässä ovat siltarivisi:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Hae sillat!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ei mikään"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Valitse valitsimet siltatyypille:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Tarvitsetko IPv6-osoitteita?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Tarvitsetko %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Selaimesi ei näytä kuvia oikein."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Syötä merkit yläpuolella olevasta kuvasta..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Kuinka aloitat siltojesi käytön"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Lisätäksesi siltauksia Tor Browseriin mene %s Tor Browserin lataussivulle %s ja seuraa ohjeita siellä ladataksesi ja käynnistääksesi Tor Browserin."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Kun â??Tor-verkkoasetuksetâ??-valintaikkuna ponnahtaa näkyviin, napsauta â??Configureâ?? ja seuraa asetusvelhoa, kunnes se kysyy:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Estääkö tai sensuroiko Internet-palvelutarjoajasi (ISP) muuten yhteyksiä\nTor-verkkoon?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Valitse â??Kylläâ?? ja napsauta sitten â??Seuraavaâ??. Uusien siltojen konfiguroimiseksi kopioi ja\nliitä siltarivit tekstisyöteikkunaan. Napsauta lopuksi â??Yhdistäâ??, ja siirtymisen pitäisi\nonnistua! Jos kohtaat pulmia, yritä saada lisäapua napsauttamalla â??Opasteâ??-\npainiketta â??Tor-verkkoasetuksetâ??-asetusvelhossa."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Näyttää tämän viestin."
-
-#. 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 "Pyydä tavallisia siltoja."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Pyydä IPv6-siltoja."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pyydä TYPE-tyyppistä irrotettavaa Pluggable Transport-siirtoa."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Hae kopio BridgeDB:n julkisesta GnuPG-avaimesta."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
index 12d091d..57616ff 100644
--- a/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/fr/LC_MESSAGES/bridgedb.po
@@ -1,10 +1,9 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
-# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2018-2019
+# AO <ao@xxxxxxxxxxxxxxxxxxx>, 2018-2020
# apaddlingduck, 2014
# Boubou <cece31840@xxxxxxxxx>, 2015
# Cryptie <cryptie@xxxxxxxx>, 2014
@@ -30,116 +29,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-09-23 19:14+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 14:55+0000\n"
"Last-Translator: AO <ao@xxxxxxxxxxxxxxxxxxx>\n"
"Language-Team: French (http://www.transifex.com/otf/torproject/language/fr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: fr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Désoléâ??! Un problème est survenu à la suite de votre requête."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Langue"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Signaler un bogue"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Code source"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Journal des changements"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Tout sélectionner"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Afficher le code QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Code QR pour vos lignes 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 "Un problème est survenuâ??!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Il semble quâ??il y ait eu une erreur de récupération de votre code QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont (Bridges) sur vos appareils, mobiles ou autres."
+msgstr "Ce code QR comprend vos lignes de ponts. Lisez-le avec un lecteur de codes QR pour copier vos lignes de pont sur vos appareils, mobiles ou autres."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "Une erreur de BridgeDB est survenue."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Aucun pont nâ??est disponible actuellementâ?¦"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Ã?tape %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Téléchargez %s le Navigateur Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Ã?tape %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Obtenez des %s ponts %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Ã?tape %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Maintenant, %s ajoutez les ponts au Navigateur Tor %s"
@@ -148,27 +162,27 @@ msgstr "Maintenant, %s ajoutez les ponts au Navigateur Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "Donnez-moi %sj%suste des pontsâ??!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Options avancées"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Non"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sO%suiâ??!"
@@ -176,69 +190,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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 y répondre.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ceci est un courriel automatisé.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
-msgstr "Voici vos ponts :"
+msgstr "Voici vos ponts :"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 est de %s heures. Tout autre courriel durant cette période sera ignoré."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDES : (combiner des commandes pour spécifier plusieurs options simultanément)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bienvenue à BridgeDBâ??!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TYPE de transport pris en charge actuellement :"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Bonjour, %sâ??!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Bonjour, lâ??amiâ??!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Clés publiques"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ce courriel a été généré avec des arcs en ciel, des licornes et des étincelles pour %s le %s à %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Si ces ponts ne sont pas ce dont vous avez besoin, répondez à ce courriel en incluant une des commandes suivantes dans le corps du courriel :"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -249,7 +231,7 @@ msgid ""
msgstr "BridgeDB peut fournir des ponts avec plusieurs %stypes de transports enfichables%s, qui peuvent aider à brouiller vos connexions vers le réseau Tor. Il est ainsi plus difficile pour quiconque surveille votre trafic Internet de déterminer que vous utilisez Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -261,7 +243,7 @@ msgstr "Certains ponts sont aussi proposés avec des adresses IPv6, bien que cer
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -270,134 +252,169 @@ msgid ""
"\n"
msgstr "De plus, BridgeDB propose de nombreux ponts traditionnels %s sans transport enfichable %s qui peuvent quand même aider à contourner la censure Internet dans bien des cas.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Que sont les pontsâ???"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Il me faut une autre façon dâ??obtenir des pontsâ??!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Une autre façon dâ??obtenir des ponts est dâ??envoyer un courriel à %s. Veuillez prendre note que vous devez envoyer le courriel en utilisant une adresse provenant dâ??un des fournisseurs de courriel suivants :\n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Une autre façon dâ??obtenir des ponts est dâ??envoyer un courriel à %s. Laissez lâ??objet du courriel vide et écrivez « get transport obfs4 » dans le corps du courriel. Veuillez notez que vous devez envoyer le courriel à partir dâ??une adresse qui provient dâ??un des fournisseurs de courriel suivants : %s ou %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
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".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 de renseignements sur votre cas que possible, incluant la liste de ponts et de transports enfichables que vous avez essayé dâ??utiliser, votre version du Navigateur Tor et tout message donné par Tor, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Si votre Navigateur Tor ne peut pas se connecter, veuillez consulter le %s et notre %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Voici vos lignes de pontsâ??:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Obtenez des pontsâ??!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mécanismes de distribution des ponts"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB met en Å?uvre quatre mécanismes de distribution de ponts. : « HTTPS », « Moat », « Courriel » et « Réservés ». Les ponts qui ne sont pas distribués par BridgeDB utilisent le pseudo mécanisme « Aucun ». La liste suivante explique brièvement le fonctionnement de ces mécanismes. Nos %smesures BridgeDB%s affiche la popularité de chaque mécanisme."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Le mécanisme de distribution « HTTPS » distribue des ponts à partir de ce site Web. Afin dâ??obtenir des ponts, accédez à %shttps://bridges.torproject.org/?lang=fr%s, sélectionnez les options qui vous conviennent et résolvez le captcha."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Le mécanisme de distribution « Moat » fait partie du Navigateur Tor et permet aux utilisateurs de demander des ponts à partir des préférences du Navigateur Tor. Pour obtenir des ponts, accédez aux %sparamètres de Tor%s dans les préférences de votre Navigateur Tor, cliquez sur « Demander un nouveau pont », résolvez le captcha et le Navigateur Tor ajoutera automatiquement vos nouveaux ponts."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Les utilisateurs peuvent demander des ponts au mécanisme de distribution « Courriel » en envoyant un courriel à %sbridges@xxxxxxxxxxxxxx%s et en écrivant « get transport obfs4 » dans le corps du courriel."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Réservés"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB administre un petit nombre de ponts qui ne sont pas distribués automatiquement. Nous réservons plutôt ces ponts pour une distribution manuelle aux ONG et autres organismes, mais aussi aux personnes qui ont besoin de ponts. Les ponts distribués par le mécanisme « Réservés » pourraient nâ??être utilisés par aucun utilisateur pendant longtemps. Notez que le mécanisme de distribution « Réservés » est appelé « Non attribués » dans les fichiers dâ??%sattribution de la réserve de ponts%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Aucune"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Les ponts dont le mécanisme de distribution est « Aucun » ne sont pas distribués par BridgeDB. La distribution de ces ponts aux utilisateurs est la responsabilité de lâ??opérateur du pont. Notez que lors dâ??une Recherche de relais, le mécanisme de distribution dâ??un pont qui vient juste dâ??être mis en place indique « Aucun » pendant environ une journée. Veuillez faire preuve de patience, il affichera bientôt le bon mécanisme de distribution de ponts.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Veuillez choisir des options pour le type de pontsâ??:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Avez-vous besoin dâ??adresses IPv6â???"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Avez-vous besoin dâ??un transport enfichable (%s)â???"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Votre navigateur nâ??affiche pas les images correctement."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
-msgstr "Saisir les caractères de lâ??image ci-dessusâ?¦"
+msgstr "Saisissez les caractères de lâ??image ci-dessusâ?¦"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Comment commencer à utiliser vos pontsâ???"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Pour saisir des ponts dans le Navigateur Tor, rendez-vous dâ??abord à la %s page de téléchargement du Navigateur Tor %s et suivez les instructions que vous y trouverez pour télécharger et démarrer le Navigateur Tor."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Vous devez dâ??abord %stélécharger le Navigateur Tor%s. Notre guide dâ??utilisation du Navigateur Tor explique comment ajouter vos ponts dans le Navigateur Tor. Si vous utilisez Windows, Linux ou macOS, %scliquez ici%s pour plus de précisions. Si vous utilisez Android, %scliquez ici%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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 suivez lâ??assistant jusquâ??à ce quâ??il demande :"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Ajoutez ces ponts à votre Navigateur Tor en accédant aux préférences de votre navigateur, en cliquant sur « Tor », puis en les ajoutant dans le champ « Fournir un pont »."
-#. 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 "Votre fournisseur dâ??accès à Internet (FAI) bloque-t-il ou censure-t-il vos connexions au réseau Torâ???"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Demander des ponts Tor non brouillés.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Sélectionnez « Oui » et cliquez ensuite sur « Suivant ». Pour configurer vos nouveaux ponts, copiez et collez les lignes de ponts dans la boîte de saisie de texte. Enfin, cliquez sur « Se connecter » et vous devriez avoir finiâ??! Si vous éprouvez des problèmes, cliquez sur le bouton « Aide » dans lâ??assistant des « Paramètres du réseau Tor » pour un soutien supplémentaire."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Demander des ponts traditionnels."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Demander des ponts IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Demander un transport enfichable par TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Demander des ponts IPv6.)"
-#. 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 "Obtenir une copie de la clé GnuPG publique de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Demander des ponts brouillés obfs4.)"
diff --git a/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po
index ac4cdd8..2f46d55 100644
--- a/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ga/LC_MESSAGES/bridgedb.po
@@ -1,123 +1,138 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Kevin Scannell <kscanne@xxxxxxxxx>, 2017
+# Kevin Scannell <kscanne@xxxxxxxxx>, 2017,2019
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2017-10-07 19:53+0000\n"
-"Last-Translator: Kevin Scannell <kscanne@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Irish (http://www.transifex.com/otf/torproject/language/ga/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ga\n"
"Plural-Forms: nplurals=5; plural=(n==1 ? 0 : n==2 ? 1 : n<7 ? 2 : n<11 ? 3 : 4);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "�r leithscéal! Bhà fadhb leis an iarratas a rinne tú."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Teanga"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Tuairiscigh Fabht"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Cód Foinseach"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Logchomhad athruithe"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Teagmháil"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Roghnaigh Uile"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Taispeáin Cód QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Do chuid lÃnte droichid mar chód 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 "Ochón ó!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "DealraÃonn sé gur tharla earráid agus do chód QR á fháil."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Tá do chuid lÃnte droichid laistigh den chód QR seo. Is féidir é a scanadh le léitheoir QR chun na lÃnte droichid a chóipeáil go dtà fón póca nó gléasanna soghluaiste eile."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "NÃl aon droichead ar fáil faoi láthair..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "B'fhéidir gur chóir duit %s dul siar %s agus cineál difriúil droichid a roghnú!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Céim %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "�oslódáil %s Brabhsálaà Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Céim %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Faigh %s droichid %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Céim %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Anois %s cuir na droichid le Brabhsálaà Tor %s"
@@ -126,27 +141,27 @@ msgstr "Anois %s cuir na droichid le Brabhsálaà Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sN%sà theastaÃonn uaim ach droichid!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Ardroghanna"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "NÃl"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "dada"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sT%sá!"
@@ -154,69 +169,37 @@ msgstr "%sT%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sF%saigh Droichid"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Is teachtaireacht uathoibrÃoch é seo; ná tabhair freagra.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Seo do chuid droichead:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Sháraigh tú an teorainn ráta. Tóg go bog é! Is é %s uair an chloig an tréimhse is lú a cheadaÃtear idir rÃomhphoist. Déanfar neamhaird de aon teachtaireacht eile le linn na tréimhse seo."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "ORDUITHE: (úsáid na hORDUITHE seo chun nÃos mó ná rogha amháin a shocrú san am céanna)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Fáilte go BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "CINEÃ?LACHA iompair a dtacaÃtear leo faoi láthair:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hóra a %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Dia dhuit a chara!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Eochracha PoiblÃ"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Leipreacháin a scrÃobh an rÃomhphost seo\nle haghaidh %s ar %s ag %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,7 +210,7 @@ msgid ""
msgstr "SoláthraÃonn BridgeDB droichid a úsáideann %scineálacha éagsúla Iompair Ionphlugáilte%s, a cheileann do cheangal le LÃonra Tor, sa chaoi go mbeidh sé nÃos deacra d'éinne atá ag faire ar do thrácht IdirlÃn déanamh amach go bhfuil tú ag úsáid Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -239,7 +222,7 @@ msgstr "Tá roinnt droichead a úsáideann seoltaà IPv6 ar fáil, cé nach bhfu
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -248,134 +231,169 @@ msgid ""
"\n"
msgstr "Tá go leor gnáthdhroichead ar fáil mar chuid de BridgeDB freisin, droichid %s nach mbaineann úsáid as córais iompair ionphlugáilte %s. B'fhéidir nach bhfuil siad chomh spéisiúil sin, ach cabhraÃonn siad leat cinsireacht IdirlÃn a sheachaint mar sin féin.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Cad is droichead ann?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "Is éard atá i %snDroichead%s ná athsheachadán Tor a chabhraÃonn leat cinsireacht a sheachaint."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "TeastaÃonn uaim bealach malartach le droichid a fháil!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Is féidir droichid a fháil freisin trà rÃomhphost a sheoladh chuig %s. Caithfidh tú an teachtaireacht a sheoladh ó cheann de na soláthraithe rÃomhphoist seo a leanas:\n%s, %s nó %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "NÃl mo chuid droichead ag obair! Tá cúnamh uaim!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Mura bhfuil Tor ag obair duit, seol rÃomhphost chuig %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Déan iarracht an méid is mó eolais agus is féidir a sholáthar: na droichid agus na córais iompair ionphlugáilte a d'úsáid tú, an leagan de do bhrabhsálaà Tor, teachtaireachtaà a chuir Tor amach, srl."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Seo do chuid lÃnte droichid:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Faigh Droichid!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Roghanna don chineál droichid:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "An dteastaÃonn seoltaà IPv6 uait?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "An dteastaÃonn %s uait?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "NÃl do bhrabhsálaà ag taispeáint Ãomhánna mar is ceart."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Cuir isteach na carachtair ón Ãomhá thuas..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Conas do chuid droichead a úsáid"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Chun droichid a chur le Brabhsálaà Tor, ar dtús oscail an %sleathanach Ãoslódála%s, ansin lean na treoracha atá ann leis an mbrabhsálaà a Ãoslódáil agus a thosú."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Nuair a osclaÃonn an fhuinneog 'Socruithe LÃonra Tor', cliceáil 'Cumraigh' agus lean an treoraà go dtà go bhfiafraÃonn sé:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "An bhfuil do Sholáthraà SeirbhÃse IdirlÃn (ISP) ag cur cosc ar, nó ag déanamh cinsireacht ar cheangail le LÃonra Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Roghnaigh 'Tá' ansin cliceáil 'Ar Aghaidh'. Chun na droichid nua a chumrú, cóipeáil agus greamaigh na lÃnte droichid isteach sa mbosca ionchurtha. Ansin, cliceáil 'Ceangail' agus beidh gach uile rud réidh! Má tharlaÃonn aon fhadhb, cliceáil an cnaipe 'Cabhair' sa treoraà 'Socruithe LÃonra Tor' chun tuilleadh eolais a fháil."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Taispeánann sé an teachtaireacht seo."
-
-#. 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 "Iarr gnáthdhroichid."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Iarr droichid IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Iarr Córas Iompair Ionphlugáilte de réir a CHINE�L."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Faigh cóip den eochair phoiblà GnuPG a úsáideann BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..b074171
--- /dev/null
+++ b/bridgedb/i18n/gd/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Mairi Macleod <mairi_mac9@xxxxxxxxxxx>, 2016,2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Gaelic, Scottish (http://www.transifex.com/otf/torproject/language/gd/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: gd\n"
+"Plural-Forms: nplurals=4; plural=(n==1 || n==11) ? 0 : (n==2 || n==12) ? 1 : (n > 2 && n < 20) ? 2 : 3;\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Duilich! Chaidh rudeigin cearr leis na dh'iarr thu."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Innis mu mhearachd"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Còd Tùsail"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Clar-atharraich"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Tagh e uile"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Seall Còd-QR"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Còd-QR airson do loidhnichean-drochaid"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Tha e coltach gu bheil mearachd air a bhith ann a' faighinn do Chòd-QR."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Tha na loidhnichean drochaid agad sa Chòd QR seo. Sganaich an còd leis an leughadair QR agad gus lethbhreac fhaighinn air na h-innealan eile a th' agad."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Chan eil drochaid sam bith ri fhaotainn an-drasta..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "'S dòcha gum bu chòir dhut %s dol air ais %s fheuchainn agus drochaid eadar-dhealaichte a thaghadh!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Ceum %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Luchdaich a-nuas %s Brabhsair Tor %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "Ceum %s2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Faigh %s drochaidean %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "Ceum %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Nise %s cuir na drochaidean ri do Shealladair 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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sB%sheir dhomh drochaidean!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Roghainnean adhartach"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Chan eil"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Chan eil gin"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%sha!"
+
+#. TRANSLATORS: Please make sure the '%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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sF%saigh Drochaidean"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Seo do dhrochaidean:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr "Rach thu thairis air na 's urrainn dhut a dhèanamh san ùine. 'S e %s uair an ùine as giorra a dh'fheumas tu fireachd eadar puist-dealain. Bidh gach post-dealan eadar an ùine air fhà gail ron ath uair air an leigeil seachad."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "'S urrainn BridgeDB drochaidean le %s dòighean siubhail a tha Pluggable %s a sholarachadh,\nagus cuidichidh iad seo thu a' doilleireachadh na ceanglaichean agad ris an lìonraich Tor,\nga dhèanamh nas\ndoirbhe do dhuine sam bith a tha a' coimhead air do thrafaig eadar-liona a tha a' feuchainn ri dearbhadh\n gu bheil thu\na' cleachdadh Tor.\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Tha feadhainn de dhrochaidean le seòlaidhean IPv6 ri fhaotainn, ged nach eil feadhainn de na dòighean siubhail Pluggable\nfreagarrach airson IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Cuideachd, tha gu leòr drochaidean à bhaisteach%s aig BridgeDB às aonais\ndòighean siubhail Pluggable %snach eil cho tarraingeach, \nach a gheibheadh\nseachad air oidhirpean oifigeil gus casg a chur air beachdan mi-iomchaidh a sgaoileadh air an t-eadar-lion.\n\n"
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "De a th' ann an drochaidean?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "'S e turais pà irteach Tor a th' anns na %s Drochaidean %s a bhitheas a' faighinn seachadh air oirdhirpean oifigeil gus casg a chur air beachdan mi-iomchaidh a sgaoileadh."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "Tha feum agam air dòigh eile drochaidean fhaighinn!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "Chan eil mo dhrochaidean ag obair! Tha feum agam air cuideachadh!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "Seo do loidhnichean-drochaid:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Faigh Drochaidean!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "A bheil feum agad air seolaidhean-IPv6?"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "A bheil feum agad air seòlaidhean IPv6?"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Am feum thu %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "Chan eil do Shealladair a' sealltainn dealbhan anns an dòigh cheart."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "Sgrìobh a-steach na caractaran bhon ìomhaigh gu h-à irde..."
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "Mar a thòisicheas tu a' cleachdadh do dhrochaidean"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
index 6d5e9ac..5fd3596 100644
--- a/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/gl/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Eu <luz.armas@xxxxxx>, 2014
@@ -12,116 +12,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-02-06 11:07+0000\n"
-"Last-Translator: Oscar Guardiola <Oscar.Guardiola@xxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Galician (http://www.transifex.com/otf/torproject/language/gl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: gl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "SentÃmolo! Algo foi mal coa súa solicitude."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingua"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Informar dun Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código Fonte"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Rexistro de Cambios"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacto"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleccionar todo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Amosar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para as súas liñas ponte"
-#. 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!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Semella que houbo un erro obtendo o seu Código QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 Código QR contén as súas liñas ponte. Escanéeo cun lector de códigos QR para copiar as súas liñas ponte nun móbil e outros dispositivos."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Non hai pontes dispoñibles agora mesmo..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Quizais deberÃa tentar %s indo hacia atrás %s i elexindo un tipo de ponte diferente!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Paso %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Descargar %s Tor Bowser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Paso %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter as %s pontes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Paso %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Agora %s engada as pontes ao Tor Browser %s"
@@ -130,27 +145,27 @@ msgstr "Agora %s engada as pontes ao Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sS%sóamente dame pontes!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opcións Avanzadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Non"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ningún"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sS%si!"
@@ -158,69 +173,37 @@ msgstr "%sS%si!"
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbter Pontes"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Esta é unha mensaxe automática; por favor non responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Estes son os seus bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Excedeu o lÃmite de taxa. Por favor vaia a modo! O tempo mÃnimo entre correos electrónicos é %s horas. Todos os novos correos electrónicos durante este perÃodo de tempo serán ignorados."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOs: (combinar COMANDOs para especificar múltiples opcións simultáneamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Dámoslle a benvida a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOs de transporte soportados actualmente:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ola, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ola amigo/a!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Claves públicas"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este email foi xenerado con arcos da vella, unicornios, e faÃscas\npara %s en %s ás %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -231,7 +214,7 @@ msgid ""
msgstr "BridgeDB pode proporcionar pontes con distintos %stipos de Transportes Enchufables%s,\nque poden axudar a ofuscar a súas conexións á Rede Tor, facendo máis\ndifÃcil para calquera que vixÃe o seu tráfico de internet determinar se vostede está\nempregando Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -243,7 +226,7 @@ msgstr "Tamén están dispoñibles algunhas pontes con direccións IPv6, aÃnda
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -252,134 +235,169 @@ msgid ""
"\n"
msgstr "Adicionalmente, BridgeDB ten unha morea de pontes tradicionais de toda a vida %s sen ningún\nTransporte Enchufable %s o que non pode sonar molón, pero todavÃa\naxudan a evitar a censura de internet en moitos casos.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Que son os repetidores ponte?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Pontes %s son retransmisores Tor que lle axudan a evitar a censura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Eu necesito un xeito alternativo de obter pontes!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Outro xeito de obter pontes e enviando un email a %s. Por favor teña en conta que debe\nenviar o email empregando unha dirección dende un dos seguintes proveedores de email:\n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "As miñas pontes non funcionan! Necesito axuda!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o seu Tor non funciona, debe enviar un email a %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir tanta información como poida acerca do seu caso, incluindo a lista de\npontes de Transportes Enchufables que tentou usar, a súa versión do Tor Browser,\ne calquera mensaxes que Tor dera, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Estas son as súas liñas ponte:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Obter Pontes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nada"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Por favor seleccione opcións para o tipo de ponte:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Necesita direccións IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Necesita vostede un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "O seu navegador non está amosando imaxes adecuadamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Introduza os caracteres da imaxen de enrriba..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Cómo comenzar a usar as súas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Para introducir pontes no Tor Browser, primeiro vaia á %s páxina de descarga de\nTor Browser %s e siga as instruccións dadas para descargar e arrancar\no Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Cando apareza o diálogo 'Axustes de Rede de Tor', prema 'Configurar' e siga\no asistente ata que pregunte:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "O seu Porveedor de Servicios de Internet (ISP) bloquea ou censura conexións\ná rede Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleccione 'Si' e prema en 'Seguinte'. Para configurar as súas novas pontes, copie e\npegue as liñas ponte na caixa de entrada de texto. Finalmente, prema 'Conectar', e\ndeberÃa poder comenzar! Se ten algún problema, intente premendo o botón\n'Axuda' no asistente de 'Axustes de Rede de Tor' para axuda adicional."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Amosa esta mensaxe."
-
-#. 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 "Solicitar pontes estándar."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicitar pontes IPv6"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar un Transporte Enchufable por TIPO."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Obter unha copia da clave pública GnuPG de BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..6957187
--- /dev/null
+++ b/bridgedb/i18n/gu/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Drashti Pandya <drashtipandya37@xxxxxxxxx>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Gujarati (http://www.transifex.com/otf/torproject/language/gu/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: gu\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "માફ �રશ�! તમાર� વિન�ત� સાથ� ���� ����� થય��."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "સમસ�યાન� �ાણ �ર�"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "સ�ત�ર�ત ��ડ"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "ન��ધણ�� બદલ�"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "બધ� પસ�દ �ર�"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QRCode બતાવ�"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "તમાર� bridge લા�ન�સ મા�� QRCode"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "àª?વà«?àª? લાàª?à«? àª?à«? àª?à«? તમારà«?àª? QRCode મà«?ળવવામાàª? àªà«?લ àª?વà«? હતà«?."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+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/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "હાલમા� ��� bridges �પલબ�ધ નથ�..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "પ�લ�� %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ડા�નલ�ડ �ર� %s Tor Browser %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "પ�લ�� %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, 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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "�દ�યતન વિ�લ�પ�"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "નહિ"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "��� નહ��"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, 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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sમ�%sળવ� Bridges"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "�હ�� તમારા bridges ��:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr ""
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "મન� bridges મ�ળવવાન� વ��લ�પિ� રસ�ત� ���� ��!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "bridges મ�ળવ�!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "��� નહિ"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
index 6419a0b..d3bb8e2 100644
--- a/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/he/LC_MESSAGES/bridgedb.po
@@ -1,13 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# aharon, 2012
# Elifelet <arab.with.nargila@xxxxxxxxx>, 2014
# Dvir Rosen <ndvnis@xxxxxxxxx>, 2014
# GenghisKhan <genghiskhan@xxxxxx>, 2013,2015
-# ION, 2017-2018
+# ION, 2017-2020
# Johnny Diralenzo, 2015
# Kunda, 2014
# Kunda, 2015
@@ -18,116 +18,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-10-17 12:25+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 19:44+0000\n"
"Last-Translator: ION\n"
"Language-Team: Hebrew (http://www.transifex.com/otf/torproject/language/he/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: he\n"
"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % 1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ס×?×?×?×?! ×?ש×?×? ×?שת×?ש ×?×?קש×? ש×?×?."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "שפ×?"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "×?×?×?×? ×¢×? תק×?"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ק×?×? ×?ק×?ר"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "×?×?×?×? ש×?× ×?×?×?×?"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "צ×?ר קשר"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "×?×?ר ×?×?×?"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "×?צ×? ק×?×? QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "× ×¨×?×? ×©× ×¤×?×? ×?×¢×?ת ×?ק×?×?ת ק×?×? ×?-QR ש×?×?."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB × ×ª×§×? ×?ש×?×?×?×?."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
-msgstr "×?×?×? ×?ר×?×¢ ×?שר×?×? ×?×?×?× ×?×? ×?×?ש×?×?..."
+msgstr "×?×?×? ×?ר×?×¢ ×?שר×?×? ×?×?×?× ×?×? ×?×?ש×?×?â?¦"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ש×?×? %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "×?×?ר×? ×?ת %s ×?פ×?פ×? Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ש×?×? %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "×?ש×? %s ×?שר×?×? %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "ש×?×? %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "%s ×?×?סף ×?ת ×?×?שר×?×? ×?×?פ×?פ×? Tor %s ×¢×?ש×?×?"
@@ -136,27 +151,27 @@ msgstr "%s ×?×?סף ×?ת ×?×?שר×?×? ×?×?פ×?פ×? Tor %s ×¢×?ש×?×?"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sר%sק ת×? ×?×? ×?שר×?×?!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "×?פשר×?×?×?ת ×?תק×?×?×?ת"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "×?×?"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "×?×£ ×?×?×?"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%s×?%s×?!"
@@ -164,69 +179,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sק%s×?×? ×?שר×?×?"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[×?×?×?×? ×?×?×?×¢×? ×?×?×?×?×?×?×?ת; × ×? ×?×? ×?×?ש×?×?.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[×?×?×? ×?×?×?×´×? ×?×?×?×?×?×?×?.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "×?× ×? ×?×?שר×?×? ש×?×?:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 שע×?ת. ×?×? ×?×?×?×?×´×?×?×? ×?× ×?ספ×?×? ×?×?×?×?×? פרק ×?×?×? ×?×? ×?×?תק×?×? ×?×?תע×?×?×?ת."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "פק×?×?×?ת: (ש×?×? פק×?×?×?ת ×?×?×? ×?צ×?×?×? ×?פשר×?×?×?ת ×?ר×?×?×?ת ×?×?Ö¾×?×?× ×?ת)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "×?ר×?×? ×?×?×? ×?×? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "transport TYPEs ×?× ×ª×?×?×?×? ×?ר×?×¢:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "×?×?×?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ש×?×?×?, ×?×?ר!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "×?×?×?\"×? ×?×? × ×?צר ×¢×? קשת×?ת ×?×¢× ×?, ×?×?×?־קר×? ×?× ×¦× ×¦×?×?\n×¢×?×?ר %s ×?ת×?ר×?×? %s ×?שע×? %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "×?×? ×?שר×?×? ×?×?×? ×?×?× ×? ×?×? ש×?ת×? צר×?×?, ×?ש×? ×?×? ×?×?×?×´×? ×?×? ×¢×? ×?×?ת\n×?×?פק×?×?×?ת ×?×?×?×?ת ×?×?×?×£ ×?×?×?×?×¢×?:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,158 +217,193 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB ×?×?×?×? ×?ספק ×?שר×?×? ×¢×? ×?ספר ס×?×?×?×? ש×? %s×?ס×?×?×? תע×?×?ר×?%s, ×?×?ס×?×?×¢×?×? ×?×?ש×?ש ×?ת עק×?×?ת ×?ת×?×?ר×?ת×? ×?רשת Tor ×?×?×?×? ×?קש×?×? ×¢×? ×?×?ר×?×?×? ×?×?פק×?×?×? ×¢×? ×?×?×?×?ר ×?×?×?× ×?×¨× ×? ש×?×? ×?×?×?×?×?×? ×?×?×? ש×?ת×? ×¢×?ש×? ש×?×?×?ש ×?-Tor.\n"
+msgstr "BridgeDB ×?×?×?×? ×?ספק ×?שר×?×? ×¢×? ×?ספר ס×?×?×?×? ש×? %s×?ס×?×?×? תע×?×?ר×?%s, ×?×?ס×?×?×¢×?×? ×?×?×?פ×?×? ×?ת עק×?×?ת ×?ת×?×?ר×?ת×? ×?רשת Tor ×?×?×?×? ×?קש×?×? ×¢×? ×?×?ר×?×?×? ×?×?פק×?×?×? ×¢×? ×?×?×?×?ר ×?×?×?× ×?×¨× ×? ש×?×? ×?×?×?×?×?×? ×?×?×? ש×?ת×? ×¢×?ש×? ש×?×?×?ש ×?Ö¾Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "×?ספר ×?שר×?×? ×¢×? ×?ת×?×?×?ת IPv6 ×?×?×?× ×?×? ×?×? ×?×?, ×?×¢\"פ ש×?ספר תע×?×?ר×?ת × ×ª×?ק×?ת ×?×?× ×? ת×?×?×?×?ת IPv6.\n"
+msgstr "×?ספר ×?שר×?×? ×¢×? ×?ת×?×?×?ת IPv6 ×?×?×?× ×?×? ×?×? ×?×?, ×?ע״פ ש×?ספר תע×?×?ר×?ת × ×ª×?ק×?ת ×?×?× ×? ת×?×?×?×?ת IPv6.\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "×?× ×?סף, ×?-BridgeDB ×?ש שפע ש×? ×?שר×?×? ×?×?ס×?×? ×?×?ש×? ×?×?×?×?×? %s ×?×?×? ×?ס×?×?×? תע×?×?ר×? ×?×?ש×?×? %s, ×?×? ש×?×?×?×? ×?×? × ×©×?×¢ ×?×?× ×?×?, ×?×? ×?×? ×¢×?×?×? ×?×?×?×?×?×? ×?×¢×?×?ר ×?עק×?×£ ×¦× ×?×?רת ×?×?× ×?×¨× ×? ×?×?קר×?×? ר×?×?×?.\n"
+msgstr "×?× ×?סף, ×?Ö¾BridgeDB ×?ש שפע ש×? ×?שר×?×? ×?×?ס×?×? ×?×?ש×? ×?×?×?×?×? %s ×?×?×? תע×?×?ר×?ת × ×ª×?ק×?ת ×?×?ש×?×? %s, ×?×? ש×?×?×?×? ×?×? × ×©×?×¢ ×?×?× ×?×?, ×?×? ×?×? ×¢×?×?×? ×?×?×?×?×?×? ×?×¢×?×?ר ×?עק×?×£ ×¦× ×?×?רת ×?×?× ×?×¨× ×? ×?×?קר×?×? ר×?×?×?.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "×?×?×? ×?שר×?×??"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s ×?שר×?×? %s ×?×? ×?×?סר×? Tor ×?×¢×?×?ר×?×? ×?×? ×?עק×?×£ ×¦× ×?×?ר×?."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "×?× ×? צר×?×? ×?ר×? ×?×?×?פ×?ת ×?ק×?×?ת ×?שר×?×?!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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. ×?× ×? ש×?×? ×?×? ש×?ת×? ×?×?×?×? ×?ש×?×?×? ×?ת ×?×?×?×?×´×? ×¢\"×? ש×?×?×?ש ×?×?×?×? ×?ספק×? ×?×?×?×?\"×? ×?×?×?×?×?:\n%s, %s ×?×? %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "×?ר×? ×?×?רת ×?×?ש×?×? ×?שר×?×? ×?×?×? ×?ש×?×?×? ×?×?×?×´×? ×?×? %s. ×?ש×?ר ×?ת × ×?ש×? ×?×?×?×?×´×? ר×?ק ×?×?ת×?×? \"get transport obfs4\" ×?×?×?×£ ×?×?×?×?×¢×? ש×? ×?×?×?×?×´×?. ×?× ×? ש×?×? ×?×? ש×?ת×? ×?×?×?×? ×?ש×?×?×? ×?ת ×?×?×?×?×´×? ×¢×? ×?×?×? ש×?×?×?ש ×?×?ת×?×?ת ×?×?×?×? ספק×? ×?×?×?×?×´×?×?×? ×?×?×?×?×?: %s ×?×? %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "×?×?שר×?×? ש×?×? ×?×? ×¢×?×?×?×?×?! ×?× ×? צר×?×? ×¢×?ר×?!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "×?×? Tor ×?×? ×¢×?×?×?, ×¢×?×?×? ×?ש×?×?×? ×?×?×?×´×? ×?×?%s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 ×?×?×?ס ×?×?×¢×?×? ×?×?×? פר×? × ×?סף שר×?×?×?× ×?×? ×?×¢×?× ×?×?."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "×?×? ×?פ×?פ×? Tor ש×?×? ×?×?× ×? ×?×?×?×? ×?×?ת×?×?ר, ×?× ×? ×?×¢×£ ×?×?×? ×¢×? %s ×?×¢×? %s ש×?× ×?."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "×?×?×?×? ש×?ר×?ת ×?×?שר ש×?×?:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "×?ש×? ×?שר×?×?!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "×?× ×?× ×?× ×? ×?פצת ×?שר×?×?"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB ×?×?×?ש×? ×?ר×?×¢×? ×?× ×?× ×?× ×?×? ×?×?פצת ×?שר×?×?: \"HTTPS\", \"Moat\",\n\"×?×?×?×´×?\", ×?\"ש×?Ö¸×?×?ּר\". ×?שר×?×? ש×?×?× ×? ×?×?פצ×?×? ×¢×? ×?×?×? BridgeDB ×?שת×?ש×?×? ×?×?× ×?× ×?×? ×?×?×?×?×?×? \"×?×?×?×?\". ×?רש×?×?×? ×?×?×?×? ×?ס×?×?ר×? ×?קצר×? ×?×?צ×? ×?× ×?× ×?× ×?×? ×?×?×? ×¢×?×?×?×?×? ×?%s×?×?×?×? BridgeDB%s ש×?× ×? ×?×?×?×?×?×?×? ×?×?×? פ×?פ×?×?ר×? ×?×? ×?×?×? ×?×?×?× ×?× ×?× ×?×?."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "×?× ×?× ×?×? ×?×?פצ×? \"HTTPS\" ×?×?×?ק ×?שר×?×? ×¢×? ×?×?×? ×?תר ×?×?. ×?×?×? ×?ק×?×?\n×?שר×?×?, ×?×? ×?×? %sbridges.torproject.org%s, ×?×?ר ×?ת ×?×?פשר×?×?×?ת ×?×?×?×¢×?פ×?ת ×¢×?×?×?,\n×?פת×?ר CAPTCHA ש×?×?×?ר ×?×?×?."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "×?× ×?× ×?×? ×?×?פצ×? \"Moat\" ×?×?×? ×?×?ק ×?×?פ×?פ×? Tor, ×?×? ש×?ת×?ר ×?×?שת×?ש×?×?\n×?×?קש ×?שר×?×? ×?ת×?×? ×?×?×?ר×?ת ×?פ×?פ×? Tor. ×?×?×? ×?ק×?×? ×?שר×?×?, ×?×? ×?×?\n%s×?×?×?ר×?ת Tor%s ש×? ×?פ×?פ×? Tor ש×?×?, ×?×?×¥ ×¢×? \"×?קש ×?שר ×?×?ש\", פת×?ר\nCAPTCHA ש×?×?×?ר ×?×?×?, ×?×?פ×?פ×? Tor ×?×?ס×?×£ ×?×?×?פ×? ×?×?×?×?×?×?×? ×?ת ×?×?שר×?×?\n×?×?×?ש×?×? ש×?×?."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "×?שת×?ש×?×? ×?×?×?×?×?×? ×?×?קש ×?שר×?×? ×?×?× ×?× ×?×? ×?×?פצ×? \"×?×?×?×´×?\" ×¢×? ×?×?×? ש×?×?×?ת\n×?×?×?×´×? ×?×? %sbridges@xxxxxxxxxxxxxx%s ×?×?ת×?×?ת \"get transport obfs4\" ×?×?×?×£ ×?×?×?×?×´×?."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "ש×?Ö¸×?×?ּר"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB ×?ת×?×?ק ×?ספר ק×?×? ש×? ×?שר×?×? ש×?×?× ×? ×?×?פצ×?×?\n×?×?×?פ×? ×?×?×?×?×?×?×?. ×?×?ק×?×? ×?×?ת, ×?× ×?× ×? ש×?×?ר×?×? ×?שר×?×? ×?×?×? ×¢×?×?ר ×?פצ×? ×?×?× ×?ת\n×?×?×?×?ק×?×? ×?×?ת×? ×?×? ×?ר×?×?× ×?×? ×?×?ת×?Ö¾×?×?ש×?ת×?×?×? ×?×?ר×?×?× ×?×? ×?×?ר×?×? ×?×?×?×?×?× ×?×?×? שצר×?×?×?×?\n×?שר×?×?. ×?שר×?×? ש×?×?צפ×?×? ×¢×? ×?×?×? ×?× ×?× ×?×? \"ש×?Ö¸×?×?ּר\" עש×?×?×?×? ש×?×?\n×?ר×?×?ת ×?שת×?ש×?×? ×?×?ש×? ×?×?×? ר×?. ש×?×? ×?×? ש×?× ×?× ×?×? ×?×?פצ×? \"ש×?Ö¸×?×?ּר\" ×?×?×?\n× ×§×¨×? \"×?×?ת×?Ö¾×?×?קצ×?\" ×?ק×?צ×? %s×?×?×?ת ×?ר×?×?×? ש×? ×?שר%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "×?×?×?×?"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "×?שר×?×? ×?שר ×?× ×?× ×?×? ×?×?פצ×? ש×?×?×? ×?×?×? \"×?×?×?×?\" ×?×?× ×? ×?×?פצ×?×? ×¢×´×? BridgeDB.\n×?×?ת ×?×?ר×?×?ת ש×? ×?תפע×? ×?×?שר ×?×?פ×?×¥ ×?ת ×?×?שר×?×? ש×?×? ×?×?שת×?ש×?×?.\nש×?×? ×?×? ש×?×?×?פ×?ש ×?×?סר, ×?× ×?× ×?×? ×?פצ×? ×?ר×? ש×?×?×?×?ר ש×? ×?שר\n×?×?×?ר \"×?×?×?×?\" ×¢×? ×?×?×? ×?×?×? ×?ק×?ר×?×?. ×?× ×? ×?×?×?×? ס×?×?× ×?, ×?×?×? ×?×? ×?×©×ª× ×?\n×?×? ×?× ×?× ×?×? ×?×?פצ×? ×?×?×?ש×? ש×? ×?×?שר.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "×?× ×? ×?×?ר ×?פשר×?×?×?ת ×?ס×?×? ×?×?שר:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "×?×?×? ×?ת×? צר×?×? ×?ת×?×?×?ת IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "×?×?×? ×?ת×? צר×?×? %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "×?×?פ×?פ×? ש×?×? ×?×? ×?צ×?×? ת×?×?× ×?ת ×?ר×?×?×?."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
-msgstr "×?×?× ×¡ ×?ת ×?ת×?×?×?×? ×?×?ת×?×?× ×? ×?×?×¢×?×?..."
+msgstr "×?×?× ×¡ ×?ת ×?ת×?×?×?×? ×?×?ת×?×?× ×? ×?×?×¢×?×?â?¦"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "×?×?×? ×?×?ת×?×?×? ×?×?שת×?ש ×?×?שר×?×? ש×?×?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "×?×?×? ×?×?×?× ×?ס ×?שר×?×? ×?ת×?×? ×?פ×?פ×? Tor, ר×?ש×?ת ×?×? ×?×? %s ×?×£ ×?×?ר×?ת ×?פ×?פ×? Tor %s ×?×?×?×?ר ×?×?×? עק×?×? ×?×?ר ×?×?×?ר×?×?ת ×¢×?×?ר ×?×?ר×?×? ×?×?ת×?×?×? ש×? ×?פ×?פ×? Tor."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " ת×?×?×?×?, ×?ת×? צר×?×? %s×?×?×?ר×?×? ×?ת Tor Browser%s. ×?×?ר×?×? ×?שת×?ש Tor Browser\n ש×?× ×? ×?ס×?×?ר ×?×?×? ×?ת×? ×?×?ס×?×£ ×?שר×?×? ×?×? Tor Browser. ×?×? ×?ת×?\n ×?שת×?ש ×?Ö¾Windows, Linux ×?×? OS X, %s×?×?×¥ ×?×?×?%s ×?×?×? ×?×?×?×?×? ×¢×?×?. ×?×? ×?ת×?\n ×?שת×?ש ×?Ö¾Android, %s×?×?×¥ ×?×?×?%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "×?×?שר ×?×?×?־ש×?×? '×?×?×?ר×?ת רשת Tor' ×?צ×?×¥, ×?×?×¥ ×¢×? '×?×?×?ר' ×?עק×?×? ×?×?ר ×?×?שף ×¢×? ש×?×?×? ×?ש×?×?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "×?×?סף ×?שר×?×? ×?×?×? ×?×? ×?פ×?פ×? Tor ש×?×? ×¢×? ×?×?×? פת×?×?ת ×?×¢×?פ×?ת\n×?×?פ×?פ×? ש×?×?, ×?×?×?צ×? ×¢×? \"Tor\", ×?×?×? ×?×?ספת×? ×?×? ×?ש×?×? \"ספק\n×?שר\"."
-#. 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 "×?×?×? ספק ש×?ר×?ת×? ×?×?×?× ×?×¨× ×? ש×?×? ×?×?ס×? ×?×? ×?×¦× ×?ר ×?×?×?×?ר×?×? ×?×? רשת Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(×?קש ×?שר×? Tor ×?×?ת×? ×?×?×?פ×?×?×?.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "×?×?ר '×?×?' ×?×?×? ×?×?×¥ ×¢×? '×?×?×?'. ×?×?×? ×?תצר ×?ת ×?×?שר×?×? ×?×?×?ש×?×? ש×?×?, ×?עתק ×?×?×?×?ק ×?ת ש×?ר×?ת ×?×?שר×?×? ×?ת×?×? ת×?×?ת ×?ק×?×? ש×? ×?×?×?×?. ×?×?ס×?×£, ×?×?×¥ ×¢×? '×?ת×?×?ר' ×?×?ת×? ×?×?×?ר ×?×?×?×?ת ×?×?×?×?! ×?×? ת×?×?×?×? תק×?×?, × ×¡×? ×?×?×?×?×¥ ×¢×? ×?×?פת×?ר '×¢×?ר×?' ×?×?שף '×?×?×?ר×?ת רשת Tor' ×?ס×?×?×¢ × ×?סף."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "×?קש ×?שר×?×? ×?×?ס×?×? ×?×?ש×?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "×?קש ×?שר×? IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "×?קש תע×?×?ר×? × ×ª×?ק×? ×¢\"×? TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(×?קש ×?שר×? IPv6.)"
-#. 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 "ק×?×? ×¢×?תק ש×? ×?פת×? ×?-GPG ×?צ×?×?×?ר×? ש×? BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(×?קש ×?שר×? obfs4 ×?×?×?פ×?×?×?.)"
diff --git a/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po
index 912ca93..8f479b2 100644
--- a/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hi/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# A. Saad Imran, 2016
@@ -11,116 +11,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: hi\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "��षमा �र�� ! �प�ा �न�र�ध प�रा नह�� �िया �ा स�ा। "
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¤à¤¾à¤·à¤¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "�िस� त�र��� �� बार�� म�� बता��। "
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "स���त लिपि �ा स�त�र�त।"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "परिवर�तनस���।"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "स�पर�� �र��।"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "सब ��� ��न�। "
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRcode (��य��र ��ड) दि�ा��। "
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "य� रह� QRCode (��य��र ��ड) �प�� bridges 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 "�र� नह�� , ��� सह� नह�� ह�!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "�सा ल� रहा ह� �प�� QRCode �� प�राप�त �रन� म�� ��� त�र��� ह��."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 �प�� bridge lines र�ता ह��. �पन� bridge lines �� म�बा�ल �र द�सर� �प�रण�� म�� प�रतिलिपि प�राप�त �रन� �� लि� �स� QRCode Reader स� Scan �र�� ."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "�स समय ��� bridge �पलब�ध नह�� ह�� ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "शायद �प�� %sप��� �ा�र %sद�बारा स� द�सरा bridge type �ा �यन �रन� �� ��शिश �रन� �ाहि�!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "�रण %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser %s डा�नल�ड �र��."
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "�रण %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s bridges %s प�राप�त ह� रह� ह�� "
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "�रण %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "�ब %s bridges �� Tor Browser स� ����� %s"
@@ -129,27 +144,27 @@ msgstr "�ब %s bridges �� Tor Browser स� ����� %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%s��वल%s bridges द��िय� !"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "�न�नत वि�ल�प"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "नह��"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "à¤?à¥?à¤? à¤à¥? नहà¥?à¤?"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%s��%s हा�!"
@@ -157,69 +172,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sB%sridges प�राप�त ह� रह� ह��."
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[यह �� स�व�ालित सन�द�श ह��; ��प�या �वाब न द��.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "य� रह� �प�� bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "�पन� �व�ति दर �� स�मा पार �र ल� ह�. ��पया �ति �म �र��! \nEmails �� ब�� �ा न�य�नतम समय %s ���� ह��. �स समय स�मा म�� �न� वाल� Emails �नद��� �र दि� �ाय���. "
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "�द�श: (��रमश� �� स� �धि� वि�ल�प �ल�ल��ित �रन� �� लि� �द�श�� �� �� साथ �����)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB म�� �प�ा स�वा�त ह��!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "वर�तमान म�� समर�थित Transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "�र�, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "नमस�त�, द�स�त!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "यह �म�ल र�न�ब�व�स, य�नि��र�न�स �र स�पार���ल�स �� साथ %s �� लि� %s पर %s म�� बनाया �या ह�."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +213,7 @@ msgid ""
msgstr "BridgeDB �� %s प�र�ार �� Pluggable Transports %s प�रदान �र स�ता ह�,\n�� �ि Tor Network �� साथ �प�� �न���शन �� �स�पष�� �रन� म�� मदद �रता ह� �िसस� �ि\n�प�� �न��रन�� ��र�फि� �� द���र यह पता ल�ाना\nम�श��िल ह� �ि �प Tor �स�त�माल �र रह� ह��.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -242,7 +225,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +234,169 @@ msgid ""
"\n"
msgstr "à¤?सà¤?à¥? à¤?तिरिà¤?à¥?त, BridgeDB à¤?à¥? पास à¤?à¥?à¤? साधारण bridges %s बिना à¤?िनà¥?हà¥?à¤? Pluggable Transports %s\nà¤?à¥? à¤à¥? हà¥?à¤?. à¤?à¥? à¤?ि सà¥?ननà¥? मà¥?à¤? à¤?तनà¥? à¤?à¤?à¥?à¤?à¥? नहà¥?à¤? हà¥? लà¥?à¤?िन फिर à¤à¥? यà¥?\nà¤?à¥?à¤? मामलà¥? मà¥?à¤? à¤?नà¥?à¤?रनà¥?à¤? सà¥?à¤?सरशिप à¤?à¥? रà¥?à¤? सà¤?तà¥? हà¥?à¤?.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "bridges ��या ह��?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s Tor रिल� ह� �� �ि �न��रन�� पाबन�द� �� ना�ाम �रन� म�� �प�� मदद �र स�त� ह��."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "म��� Bridges प�राप�त �रन� �� लि� �� व��ल�पि� तर��� �� �र�रत ह�!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Bridges पà¥?रापà¥?त à¤?रनà¥? à¤?ा à¤?नà¥?य तरà¥?à¤?ा %s à¤?à¥? à¤?à¤? à¤?मà¥?ल à¤à¥?à¤?ना हà¥?à¤?. à¤?à¥?पया धà¥?यान दà¥?à¤? à¤?ि à¤?पà¤?à¥? यह \nà¤?मà¥?ल, निमà¥?न मà¥?à¤? सà¥? à¤?िसà¥? à¤?िसà¥? à¤à¥? à¤?à¤? à¤?मà¥?ल पà¥?रदाता à¤?à¥? à¤?डà¥?रà¥?स सà¥? à¤à¥?à¤?ना हà¥?à¤?ा:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "म�र� Bridges �ाम नह�� �र रह� ह�! म��� मदद �ाहि�!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "यदि à¤?पà¤?ा Tor à¤?ाम नहà¥?à¤? à¤?र रहा हà¥? तà¥? à¤?पà¤?à¥? %s पर à¤?मà¥?ल à¤à¥?à¤?ना à¤?ाहिà¤?."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 �र Pluggable Transports �� स���\n�िन�ह�� �पन� �स�त�माल �रन� �� ��शिश ��, �प�� Tor Browser �ा स�स��रण, \n�र �स� ��� म�स�� �� Tor न� दि� ह�, �दि."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "य� रह� �प�� bridges प���तिया�:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Bridges प�राप�त �र��!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "��� नह��"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "��पया Bridge �� प�र�ार �ा वि�ल�प ��नि�:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "��या �प�� IPv6 पत�� �� �र�रत ह�?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "��या �प�� %s �ाहि�?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "�प�ा ब�रा��र फ���� �� ठ�� स� प�रदर�शित नह�� �र रहा ह�."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "�पर �� �ित�र स� ���षर डाल�."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "�प�� bridges �� �स�त�माल �रना ��स� श�र� �र��?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Tor Browser म�� bridges म�� प�रव�श �रन� �� लि�, सबस� पहल� %s Tor Browser डा�नल�ड प�� पर �ा��\n%s �र �स�� बाद वहा� पर Tor Browser �� डा�नल�ड �र श�र� �रन� �� निर�द�श�� �ा पालन �र��."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "�ब \"Tor ब�रा��र स��ि��\" �ा डायल�� सामन� �य�, तब \"configure\" पर ��लि� �र�� तथा प�र� प�र��रम �ा पालन �र�� �ब त� यह य� नह�� प���:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "��या �प�ा �न��रन�� स�वा प�रदाता (ISP)\n Tor न��वर�� स� स�पर�� पर पाबन�द� ल�ाता ह� ?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'हा�' ��न� �र तब '���' पर ��लि� �र��. �पन� न� bridges �� configure �रन� �� लि�, bridges प���तिय�� \n�� ��प� �र�� ����स�� �नप�� ब���सम�� प�स�� �र द��. ��त म��,\"स�पर�� �र��\" पर ��लि� �र�सब ��� �पन� �प ह� �ा��ा. \nयदि �प�� सामन� ��� पर�शान�\n�य� त� ��� �� सहायता �� लि� Tor न��वर�� स��ि�� म�� \"मदद\" ब�न पर ��लि� �र द��."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "vanilla bridges �� लि� निव�दन �र��."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 bridges �� लि� निव�दन �र��."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE �� द�वारा Pluggable Transport �ा �न�र�ध �र��."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "BridgeDB �� सार�व�नि� GnuPG ����� प�राप�त �र��."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po
index d64bb28..112d0e3 100644
--- a/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,10 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Joziah Cameron <cambergeron55@xxxxxxxxx>, 2016
+# milotype <mail@xxxxxxxxxxx>, 2020
# Nikola Parsifal <anchorsound@xxxxxxxxx>, 2014
# Nives Miletic <nives.miletic@xxxxxxxxx>, 2018
# Vlado V. <vlays@xxxxxxxx>, 2015
@@ -11,145 +12,160 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-04-17 20:44+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-17 14:41+0000\n"
+"Last-Translator: milotype <mail@xxxxxxxxxxx>\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 1.3\n"
+"Generated-By: Babel 2.8.0\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
-msgstr "Oprostite! Nešto je pošlo po krivu s Vašim zahtjevom."
+msgstr "Oprosti! U tvom zahtjevu je došlo do greške."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
-msgstr "Prijavite grešku"
+msgstr "Prijavi grešku"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Izvorni kod"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Zapisnik o promjenama"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Odaberi sve"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Pokaži QR kod"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
-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,
-#. 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 "O ne, greška!"
-
-#: bridgedb/https/templates/bridges.html:68
+msgstr "QR kod za tvoje retke mostova"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
-msgstr "Ä?ini se da je doÅ¡lo do greÅ¡ke pri dobavljanju VaÅ¡eg QR koda."
+msgstr "Ä?ini se da je doÅ¡lo do greÅ¡ke pri dobavljanju tvog QR koda."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
-msgstr "Ovaj QR kod sadrži VaÅ¡e linije mostova. Skenirajte ga s Ä?itaÄ?em QR koda da bi kopirali linije mostova na mobilne i ostale ureÄ?aje."
+msgstr "Ovaj QR kod sadrži tvoje retke mostova. Skeniraj ga s Ä?itaÄ?em QR koda i kopiraj retke mostova na mobilne i ostale ureÄ?aje."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB je ustanovio grešku."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
-msgstr "Trenutno nema dostupnih mostova..."
+msgstr "TrenutaÄ?no nema dostupnih mostova â?¦"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
-msgstr "Možda bi trebali probati %s vratiti se nazad %s i odabrati neki drugi tip mosta!"
+msgstr "Probaj se %s vratiti natrag %s i odaberi jednu drugu vrstu mosta!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Korak %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
-msgstr "Preuzmi %s Tor Browser %s"
+msgstr "Preuzmi %s Tor preglednik %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Korak %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Preuzmi %s mostove %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Korak %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Sad %s dodaj mostove u Tor Browser %s"
+msgstr "Sad %s dodaj mostove u Tor preglednik %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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sS%samo mi daj mostove!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Napredne opcije"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ništa"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sD%sa!"
@@ -157,69 +173,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sP%sreuzmi mostove"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ovo je automatizirana poruka; molimo ne odgovarajte na nju.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ovo je automatski generiran email.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
-msgstr "Ovo su vaši mostovi:"
+msgstr "Ovo su tvoji mostovi:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
-msgstr "PreÅ¡li ste limit. Molimo usporite! Vremenski minimum izmeÄ?u emailova\nje %s sati. Svi daljnji emailovi tijekom ovog perioda Ä?e biti ignorirani."
-
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-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 "Dobrodošli u BridgeDB!"
+msgstr "PremaÅ¡io/la si ograniÄ?enje. Uspori! Minimalno vrijeme izmeÄ?u emailova\niznosi %s sata/sati. Svi daljnji emailovi u ovom razdoblju Ä?e se zanemariti."
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Trenutno podržani tipovi transporta:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Bok, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Bok, prijatelju!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Javni kljuÄ?evi"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ovaj email je sastavljen od duge, jednoroga i iskrica\nza %s na %s u %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ako ovi mostovi nisu ono Å¡to trebaÅ¡, odgovori na ovaj e-mail s jednom od\nsljedeÄ?ih naredbi u sadržaju poruke:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,10 +211,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB nudi mostove s razliÄ?itim %stipovima prikljuÄ?nih transporta%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"
+msgstr "BridgeDB omoguÄ?uje mostove s razliÄ?itim %svrstama prikljuÄ?nih transporta%s\nkoji mogu pomoÄ?i prikriti tvoju veze s Tor mrežom, otežavajuÄ?i onome tko\nprati tvoj internetski promet vidjeti da koristiÅ¡ Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -242,143 +226,178 @@ msgstr "TakoÄ?er su dostupni neki mostovi s IPv6 adresama, no neki prikljuÄ?ni t
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nprikljuÄ?nih transporta %s koji možda ne zvuÄ?e prezanimljivo, ali mogu\npomoÄ?i zaobiÄ?i Internet cenzuru u mnogo sluÄ?ajeva.\n"
+msgstr "Nadalje, BridgeDB ima mnoÅ¡tvo dobrih, starih mostova %s bez ikakvih\nprikljuÄ?nih transporta %s koji možda ne zvuÄ?e najbolje, ali Ä?esto mogu\npomoÄ?i zaobiÄ?i internetsku cenzuru.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Å to su mostovi?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Mostovi %s su Tor releji koji vam pomažu zaobiÄ?i cenzuru."
+msgstr "%s Mostovi %s su Tor releji koji pomažu zaobiÄ?i cenzuru."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Trebam alternativni naÄ?in preuzimanja mostova!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "JoÅ¡ jedan naÄ?in za preuzimanje mostova 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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Drugi naÄ?in dobivanja mostova jest slanje e-maila na %s. Ostavi polje predmeta e-maila\npraznim, a u sadržaju poruke napiÅ¡i â??get transport obfs4â??. Napomena: e-mail se\nmora poslati pomoÄ?u adrese jednog od sljedeÄ?ih pružatelja usluge e-poÅ¡te:\n%s ili %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
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 "Ako Vaš Tor ne radi, pošaljite email na %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "PokuÅ¡ajte ukljuÄ?iti Å¡to viÅ¡e informacija o svom sluÄ?aju, ukljuÄ?ujuÄ?i popis\nmostova i prikljuÄ?nih transporta koje ste pokuÅ¡ali koristiti, verziju svog Tor Browsera,\ni bilo kakve poruke koje je Tor izbacio, itd."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ako se tvoj Tor preglednik ne da povezati, pogledaj %s i naš %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
-msgstr "Ovo su linije vaših mostova:"
+msgstr "Ovo su redci tvojih mostova:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
-msgstr "Preuzmite mostove!"
+msgstr "Preuzmi mostove!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mehanizmi za distribuciju mostova"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementira Ä?etiri mehanizma za distribuciju mostova: â??HTTPSâ??, â??Moatâ??,\nâ??E-poÅ¡taâ?? i â??Rezerviranoâ??. Mostovi koji se ne distribuiraju preko BridgeDB-a koriste\npseudo-mehanizam â??Bezâ??. SljedeÄ?i popis ukratko objaÅ¡njava kako ti mehanizmi\nrade, a naÅ¡e %smetrike BridgeDB-a%s prikazuju popularnost svakog\npojedinog mehanizma."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "â??HTTPSâ?? mehanizam za distribuciju pruža mostove preko ovog web mjesta.\nZa dobivanje mostova, idi na %sbridges.torproject.org%s, odaberi željene\nopcije i rijeÅ¡i naknadni CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "â??Moatâ?? mehanizam za distribuciju dio je Tor preglednika, a korisnicima omoguÄ?uje\nzatražiti mostove u postavkama Tor preglednika. Za dobivanje mostova, idi na\n%sTor postavke%s tvog Tor preglednika, klikni na â??Zatraži novi mostâ?? i rijeÅ¡i\nnaknadni CAPTCHA, a Tor preglednik Ä?e automatski dodati tvoje nove mostove."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Korisnici mogu zatražiti mostove putem mehanizma za distribuciju â??E-poÅ¡taâ??, slanjem\ne-poÅ¡te na %sbridges@xxxxxxxxxxxxxx%s i upisom â??preuzmi obfs4 transportâ?? u\nsadržaju e-poÅ¡te."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Rezervirano"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB održava mali broj mostova koji se ne distribuiraju automatski.\nUmjesto toga, te mostove zadržavamo za ruÄ?nu distribuciju i predajemo ih\nnevladinim i drugim organizacijama kao i pojedincima koji trebaju mostove.\nMostovi koji se distribuiraju preko mehanizma â??Rezerviranoâ??, možda neÄ?e\nvidjeti korisnike duže vrijeme. Mehanizam za distribuciju â??Rezerviranoâ??,\nnaziva se â??Nedodijeljenoâ?? u datotekama %sbaze za dodjelu mostova%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Bez"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Mostovi, Ä?iji je mehanizam za distribuciju â??Bezâ??, BridgeDB ne distribuira.\nOdgovornost je operatera mosta da distribuira svoje mostove korisnicima.\nU pretraživanju releja, svježe postavljen mehanizam za distribuciju mosta\npostavljen je na â??Bezâ?? za otprilike jedan dan. Malo se strpi i on Ä?e se promijeniti\nu stvarni mehanizam za distribuciju mosta.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
-msgstr "Molimo odaberite opcije za tip mosta:"
+msgstr "Odaberi opcije za vrstu mosta:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
-msgstr "Trebaju li Vam IPv6 adrese?"
+msgstr "Trebaš IPv6 adrese?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
-msgstr "Trebate li %s?"
+msgstr "Trebaš %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
-msgstr "Vaš preglednik ne prikazuje slike ispravno."
+msgstr "Tvoj preglednik ne prikazuje slike ispravno."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
-msgstr "Unesite znakove sa slike iznad..."
+msgstr "Upiši znakove iz gornje slike �"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Kako poÄ?eti koristite mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Kako bi unijeli mostove u Tor Browser, prvo posjetite %s Tor Browser stranicu\nza preuzimanje %s, a zatim slijedite upute za preuzimanje i pokretanje\nTor Browsera."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Najprije moraÅ¡ %spreuzeti Tor preglednik%s. NaÅ¡ korisniÄ?ki priruÄ?nik za\nTor preglednik objaÅ¡njava kako dodati vlastite mostove u Tor preglednik.\nZa sustave Windows, Linux ili OS X, %spritisni ovdje%s i saznaj viÅ¡e.\nZa Android, %spritisni ovdje%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Kad se pojavi dijaloÅ¡ki okvir 'Postavke Tor mreže', kliknite 'Konfiguriraj' i slijedite\nÄ?arobnjaka dok ne upita:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Dodaj ove mostove u svoj Tor preglednik. Otvori postavke\npreglednika, pritisni â??Torâ??, a zatim ih dodaj u polje â??OmoguÄ?i mostâ??."
-#. 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 "Blokira li VaÅ¡ Internet Service Provider (ISP - pružatelj internet usluge) ili ikako drugaÄ?ije cenzurira veze\ns Tor mrežom?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Zatraži neprikrivene Tor mostove.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Odaberite 'Da', a zatim 'SljedeÄ?e'. Da bi konfigurirali svoje 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 'PomoÄ?'\nu Ä?arobnjaku 'Postavke Tor mreže' za daljnju pomoÄ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-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 "Zatraži dobre, stare mostove."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-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 "Zatraži prikljuÄ?ni transport po tipu."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Zatraži IPv6 mostove.)"
-#. 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 "Preuzmi kopiju BridgeDB-ovog javnog GnuPG kljuÄ?a."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Zatraži obfs4 prikrivene mostove.)"
diff --git a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
index 0b6d9fe..04c8181 100644
--- a/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hu/LC_MESSAGES/bridgedb.po
@@ -1,157 +1,173 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# benewfy <benewfy@xxxxxxxxx>, 2015
# Blackywantscookies, 2014
# Lajos Pasztor <mrlajos@xxxxxxxxx>, 2014
+# PB, 2020
# GergÅ? Felde <taiurin@xxxxxxxxx>, 2014
-# vargaviktor <viktor.varga@xxxxxxxxx>, 2013,2015,2018
+# vargaviktor <viktor.varga@xxxxxxxxx>, 2013,2015,2018-2020
# vargaviktor <viktor.varga@xxxxxxxxx>, 2011
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-12-28 15:07+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-18 08:40+0000\n"
"Last-Translator: vargaviktor <viktor.varga@xxxxxxxxx>\n"
"Language-Team: Hungarian (http://www.transifex.com/otf/torproject/language/hu/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: hu\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Elnézést! Valami rosszul működött a kérésed közben."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Nyelv"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Hiba jelentése"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Forrás kód"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Változások"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kapcsolat"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Mindent kijelöl"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR Kód megjelenÃtése"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR Kód a hÃd sorokhoz"
-#. 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 "Hoppá!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "�gytűnik a QR Kód hibás."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Ez a QR Kód a hÃd sorait tartalmazza. Olvassa be egy QR Kód olvasóval, hogy átmásolja a HÃd sorokat mobil és egyéb eszközeire."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "A BridgeDB hibára futott."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Jelenleg nincsenek rendelkezésre álló hidak..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Talán megpróbálhatnál %s vissza menni %s és másik HÃd tÃpust választani."
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Lépés %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
-msgstr "Letöltés %s Tor Browser %s"
+msgstr "Letöltés %s Tor BöngészÅ? %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Lépés %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Hidak %s beszerzése"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Lépés %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Most %s a hidak hozzáadása a Tor Browser-hez %s"
+msgstr "Most %s a hidak hozzáadása a Tor BöngészÅ?höz %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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sC%ssak adjál már nekem hidakat!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Haladó beállÃtások"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nem"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "Semmi"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sS%szeretnék!"
@@ -159,69 +175,37 @@ msgstr "%sS%szeretnék!"
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sS%szerezni Bridge -et!"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ez egy automata levél, kérjük ne válaszoljon.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ez egy automata levél.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Itt vannak a hÃdjaid:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 túllépte a megadott mérték határt. Kérünk lassÃtson le! A minimum idÅ? email-ek között\n%s óra. Minden további emailt ez az idÅ? alatt elutasÃtunk."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (kombinálja COMMANDs-okat hogy többféle opciót adhasson meg egyszerre)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "�dvözöl a BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Jelenleg támogatott átviteli tÃpusok: "
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hé, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hello!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Nyilvános kulcsok"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ez az email szivárványokkal, unikornisokkal, és ragyogásokkal volt generálva\n%s -nek %s -án %s -kor."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ha ezek a hidak nem azok, amikre szüksége van, válaszoljon erre az emailre,\na következÅ? parancsokkal az üzenet törzsében:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +216,7 @@ msgid ""
msgstr "BridgeDB hidakat tud biztosÃtani számos %stÃpusával a Pluggable Transports%s -nak\namely segÃti a kapcsolatait összekeverni a Tor Network-ben, ezzel sokkal\nnehezebbé teszi akárkinek hogy megnézze az internet forgalmát és hogy meghatározza hogy Tor-t használ.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -244,7 +228,7 @@ msgstr "Néhány hÃd IPv6 cÃmekkel is elérhetÅ?, habár négány Pluggable\nT
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +237,169 @@ msgid ""
"\n"
msgstr "Ezen felül, BridgeDB -nek van sok régi módi \"vanÃlia\" hÃdjai %s melyek Csatlakoztatható SzállÃtók %s nélkül vannak\nmely talán nem hallatszik szuperül, de Å?k még mindig\ntudnak segÃteni kikerülni az internet cenzúráját.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Mik is a Hidak?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "A %s Hidak %s azok Tor relék, melyek segÃtik önt a cenzúra elkerülésében."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Szükségem van egy alternatÃv módra a Hidak beszerzéséhez!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Egy másik módja, hogy megkapd a bridge listát küldj emailt a %s cÃmre. Kérlek vedd figyelembe\naz emailt az alábbi email szolgáltató cÃmekrÅ?l küldd:\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Másik módszer hidak beszerzésére, ha emailt küld a a %s cÃmre. Hagyja üresen a tárgyat \nés Ãrja a levél törzsébe, hogy \"get transport obfs4\". Ne felejtse\nhogy a következÅ? szolgáltatók valamelyikérÅ?l kell küldenie a levelet: \n%s vagy %s"
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "A HÃdjaim nem működnek! SegÃtségre van szükségem!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ha a Tor böngészÅ?je nem működik, akkor küldjön egy email-t %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Próbáljon minél több információt megadni amennyit csak tud, beleértve a listáját \na %s hidaknak és Pluggable Transports -nak, amelyet használni próbált, A Tor Browser verzióját,\nés minden üzenetet melyet Tor adott ki, stb."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ha a Tor böngészÅ? nem tud csatlakozni, kérjük vessen pillantást itt %s és itt %s"
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Itt vannak a hÃd soraid:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Hidak szerzése!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "HÃd elosztási mechanizmusok"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Fenntartott"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nincs"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Kérjük, válasszon opciót a hÃd tÃpushoz:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Kellenek önnek IPv6 cÃmek?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Szüksége van egy %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ez a böngészÅ? nem jelenÃti meg a képeket rendesen."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Adja meg a karaktereket amik a fenti képen láthatóak ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Hogyan kezdjük használni a hidat "
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "A hidak beállÃtásához a Tor Browser-ben, elÅ?ször látogasson el a %s Tor böngészÅ? letöltés oldalra %s és kövesse az útmutatást a Tor böngészÅ? letöltésérÅ?l és használatáról."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Amikor a 'Tor Hálózati BeállÃtások' dialógus felugrik, kattintson a 'Konfigurálás'-ra és kövesse\na varászlót amÃg az kéri hogy:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Blokkolja vagy cenzúrázza az ön internet szolgáltatója (ISP) a kapcsolatokat\na Tor hálózatához?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(obfuszkálatlan Tor hidak kérése)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Válassza hogy 'Igen' és utána kattintson a 'KövetkezÅ?\"-re. Az ön új hidjai konfigurásához, másolja\nés illessze be a HÃd sorokat a felugró ablakba. Végül, kattintson 'Kapcsolódás'-ra, és \nmár készen is van. Ha valamilyen hibát tapasztal, próbáljon a 'SegÃtség'\n gombra kattintani a 'Tor hálózati beállÃtások' varázslóban a tobábbi segÃtségért."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "MegjelenÃti ezt az ütenetet."
-
-#. 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 "Nem csatlakoztatható szállÃtó hÃd kérelme."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPV6 hÃd kérése."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Egy csatlakoztatható szállÃtó kérelme TYPE szerint."
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6 hidak kérése.)"
-#. 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 "Másolat szertése a BridgeDB's publikus GnuPG kulcsából."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(obfs4 obfuszkált hidak kérése)"
diff --git a/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po
index 4931438..ff4a74a 100644
--- a/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/hy/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Hrach Mkrtchyan <mhrach87@xxxxxxxxx>, 2016
@@ -10,116 +10,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-04-15 05:53+0000\n"
-"Last-Translator: Sergei <serjsafarian@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Armenian (http://www.transifex.com/otf/torproject/language/hy/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: hy\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Õ?Õ¥Ö?Õ¥Ö?Õ¥Õ?Ö?, Õ?Õ¥Ö? Õ°Õ¡Ö?Ö?Õ¸Ö?Õ´Õ¨ Õ½ÕÕ¡Õ¬ Õ¨Õ¶Õ©Õ¡Ö?Ö? Õ½Õ¿Õ¡Ö?Õ¡Õ¾:"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ô¼Õ¥Õ¦Õ¸Ö?Õ¶"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Õ?Õ¡ÕµÕ¿Õ¶Õ¥Õ¬ Õ½ÕÕ¡Õ¬Õ« Õ´Õ¡Õ½Õ«Õ¶"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ÔµÕ¬Õ¡Õ¯Õ¥Õ¿Õ¡ÕµÕ«Õ¶ Õ¯Õ¸Õ¤"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Õ?Õ¸Ö?Õ¸ÕÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö?Õ« Õ´Õ¡Õ¿ÕµÕ¡Õ¶"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ô¿Õ¡Õº"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ô¸Õ¶Õ¿Ö?Õ¥Õ¬ Õ¢Õ¸Õ¬Õ¸Ö?Õ¨"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Õ?Õ¸Ö?Ö?Õ¡Õ¤Ö?Õ¥Õ¬ QR Õ®Õ¡Õ®Õ¯Õ¡Õ£Õ«Ö?Õ¨"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ô¿Õ¡Ö?Õ®Õ¥Õ½ Õ©Õ¥ Õ½ÕÕ¡Õ¬ Õ¿Õ¥Õ²Õ« Õ¸Ö?Õ¶Õ¥Ö?Õ¡Õ¾ Õ?Õ¥Ö? QR-Õ¯Õ¸Õ¤Õ¨ Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ«Õ½Ö?"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ô±ÕµÕªÕ´ Õ¸Õ¹ Õ´Õ« Õ°Õ¡Õ½Õ¡Õ¶Õ¥Õ¬Õ« Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ» Õ¹Õ¯Õ¡â?¦"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Õ?Õ¡ÕµÕ¬ %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Õ?Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬ %s«Tor» Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ¨%s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Õ?Õ¡ÕµÕ¬ %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Õ?Õ¿Õ¡Õ¶Õ¡Õ¬ %s Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Õ?Õ¡ÕµÕ¬ %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ô±ÕµÕªÕ´ %s Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Tor Õ¤Õ«Õ¿Õ¡Ö?Õ¯Õ«Õ¹Õ«Õ¶%s"
@@ -128,27 +143,27 @@ msgstr "Ô±ÕµÕªÕ´ %s Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?Õ¨ Tor Õ¤Õ«
#. 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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sÕ?%sÕ¡Ö?Õ¦Õ¡ÕºÕ¥Õ½ Õ¡Õ¾Õ¥Õ¬Õ¡Ö?Ö?Õ¥Ö? Õ?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Ö?"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Ô¼Ö?Õ¡Ö?Õ¸Ö?Ö?Õ«Õ¹ Õ¨Õ¶Õ¿Ö?Õ¡Õ¶Ö?Õ¥Ö?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Õ?Õ¹"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "Õ¢Õ¡Ö?Õ¡Õ¯Õ¡ Õ§"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sÔ±%sÕµÕ¸Ö?"
@@ -156,69 +171,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sÕ?%sÕ¿Õ¡Õ¶Õ¡Õ¬ Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Õ?Õ¡ Õ«Õ¶Ö?Õ¶Õ¡Õ¢Õ¡Ö? Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¾Õ¡Õ® Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¡Õ£Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ§Ö? Ô½Õ¶Õ¤Ö?Õ¸Ö?Õ´ Õ¥Õ¶Ö? Õ¹ÕºÕ¡Õ¿Õ¡Õ½ÕÕ¡Õ¶Õ¥Õ¬Ö?]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Õ?Õ¥Ö? Õ¯Õ¡Õ´Ö?Õ»Õ« Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ?"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 ÕªÕ¡Õ´Õ«Ö?Ö? Ô²Õ¸Õ¬Õ¸Ö? Õ¶Õ¡Õ´Õ¡Õ¯Õ¶Õ¥Ö?Õ¨, Õ¸Ö?Õ¸Õ¶Ö? Õ¯Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¾Õ¥Õ¶ Õ¡ÕµÕ¤ ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯Õ¡Õ°Õ¡Õ¿Õ¾Õ¡Õ®Õ¸Ö?Õ´, Õ¯Õ¡Ö?Õ°Õ¡Õ´Õ¡Ö?Õ¾Õ¥Õ¶Ö?"
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Õ?Õ?Ô±Õ?Ô±Õ?Õ?ÔµÕ?Õ? (Õ´Õ«Õ¡Õ¾Õ¸Ö?Õ¥Ö? Õ°Ö?Õ¡Õ´Õ¡Õ¶Õ¶Õ¥Ö?Õ¨Õ? Õ´Õ«Õ¡ÕªÕ¡Õ´Õ¡Õ¶Õ¡Õ¯ Õ´Õ« Ö?Õ¡Õ¶Õ« Õ¨Õ¶Õ¿Ö?Õ¡Õ¶Ö? Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ô²Õ¡Ö?Õ« Õ£Õ¡Õ¬Õ¸Ö?Õ½Õ¿ «BridgeDB»Ö?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ô²Õ¸Õ¬Õ¸Ö? Õ½ÕºÕ¡Õ½Õ¡Ö?Õ¯Õ¾Õ¸Õ² transport TYPE-Õ¥Ö?Õ¨."
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Õ?Õ¥Õ?Õµ, %sÖ?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ô²Õ¡Ö?Ö?Õ?, Õ¨Õ¶Õ¯Õ¥Ö?Õ½:"
-
-#: 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."
-#: 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-Õ«Õ¶5"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,7 @@ msgid ""
msgstr "BridgeDB-Õ¶ Õ¯Õ¡Ö?Õ¸Õ² Õ§ Õ¡Õ·ÕÕ¡Õ¿Õ¥Õ¬ %sÕ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö?Õ« Ö?Õ¸ÕÕ¡Õ¶Ö?Õ´Õ¡Õ¶ Õ´Õ« Ö?Õ¡Õ¶Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ¶Õ¥Ö?Õ« Õ°Õ¥Õ¿%s,\nÕ«Õ¶Õ¹Õ¶ Ö?Õ£Õ¶Õ¸Ö?Õ´ Õ§ Ö?Õ¸Õ²Õ¡Ö?Õ¯Õ¥Õ¬ Õ?Õ¥Ö? Õ´Õ«Õ¡Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨ Tor-Õ« Ö?Õ¡Õ¶Ö?Õ«Õ¶Õ? Õ¤Õ¡Ö?Õ±Õ¶Õ¥Õ¬Õ¸Õ¾\nÕ?Õ¥Ö? Õ°Õ¡Õ´Õ¡Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ°Õ¸Õ½Ö?Õ«Õ¶ Õ°Õ¥Õ¿Ö?Õ¥Õ¬Õ¨ Ö? Õ?Õ¥Õ¦ Õ¢Õ¡Ö?Õ¡Õ°Õ¡ÕµÕ¿Õ¥Õ¬Õ¨\n Õ¡Õ¾Õ¥Õ¬Õ« Õ¤ÕªÕ¾Õ¡Ö?Ö?\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ msgid ""
"\n"
msgstr "Õ?Õ¡Õ¾Õ¥Õ¬Õ¥Õ¶Ö?, Õ¸Ö? BridgeDB-Õ¶ Õ¸Ö?Õ¶Õ« Õ¶Õ¡Ö? Õ¢Õ¡Õ¦Õ¸Ö?Õ´ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?, Õ¸Ö?Õ¸Õ¶Ö? Õ¹Õ¥Õ¶ Õ¡Õ»Õ¡Õ¯Ö?Õ¸Ö?Õ´\n%s Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö?Õ« Ö?Õ¸ÕÕ¡Õ¶Ö?Õ¸Ö?Õ´Õ¨ %s, Õ«Õ¶Õ¹Õ¨ Õ¯Õ¡Ö?Õ¸Õ² Õ§ Õ¡Õ¦Õ¤Õ¥Õ¬ Õ¯Õ¡ÕµÖ?Õ« Õ§Õ»Õ« Õ¿Õ¥Õ½Ö?Õ« Õ¾Ö?Õ¡,\nÕ¢Õ¡ÕµÖ? Õ·Õ¡Õ¿ Õ¤Õ¥ÕºÖ?Õ¥Ö?Õ¸Ö?Õ´ Õ¯Õ¡Ö?Õ¸Õ² Õ¥Õ¶ Ö?Õ£Õ¶Õ¥Õ¬ Õ·Ö?Õ»Õ¡Õ¶Ö?Õ¥Õ¬ Õ°Õ¡Õ´Õ¡Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ£Ö?Õ¡Ö?Õ¶Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨Ö?\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ô»Õ?Õ¶Õ¹ Õ¥Õ¶ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨Ö?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ô¿Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨ %s Tor-Õ« Õ¾Õ¥Ö?Õ¡Õ°Õ¥Õ¼Õ¡Ö?Õ±Õ¡Õ¯Õ«Õ¹Õ¶Õ¥Ö? Õ¥Õ¶, Õ¸Ö?Õ¸Õ¶Ö? Ö?Õ£Õ¶Õ¸Ö?Õ´ Õ¥Õ¶ Õ?Õ¥Õ¦ Õ·Ö?Õ»Õ¡Õ¶Ö?Õ¥Õ¬ Õ£Ö?Õ¡Ö?Õ¶Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¨Ö?"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ô»Õ¶Õ± ÕºÕ¥Õ¿Ö? Õ§ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö? Õ½Õ¿Õ¡Õ¶Õ¡Õ¬Õ¸Ö? Õ¡ÕµÕ¬ Õ¥Õ²Õ¡Õ¶Õ¡Õ¯Ö?"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 Õ°Õ¡Õ½Ö?Õ¥Õ«Õ¶Ö?\nÕ?Õ¡Õ·Õ¾Õ« Õ¡Õ¼Õ¥Ö?, Õ¸Ö? Ô´Õ¸Ö?Ö? ÕºÕ¥Õ¿Ö? Õ§ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Ö? Õ§Õ¬Õ¥Õ¯Õ¿Ö?Õ¸Õ¶Õ¡ÕµÕ«Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯Õ¨ Õ°Õ¥Õ¿Ö?ÕµÕ¡Õ¬\nÕ§Õ¬. Ö?Õ¸Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ®Õ¡Õ¼Õ¡ÕµÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ´Õ¡Õ¿Õ¸Ö?Ö?Õ¸Õ²Õ¶Õ¥Ö?Õ«Ö? Õ¸Ö?Ö?Õ§ Õ´Õ¥Õ¯Õ« Õ´Õ«Õ»Õ¸Ö?Õ¸Õ¾.\n%s,%s Õ¯Õ¡Õ´ %sÖ?"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ô»Õ´ Õ¯Õ¡Õ´Õ¸Ö?Ö?Õ»Õ¶Õ¥Ö?Õ¨ Õ¹Õ¥Õ¶ Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´Ö? Ô»Õ¶Õ± Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶ Õ§ ÕºÕ¥Õ¿Ö?Ö?"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ÔµÕ©Õ¥ Õ?Õ¥Ö? Tor-Õ¨ Õ¹Õ« Õ¡Õ·ÕÕ¡Õ¿Õ¸Ö?Õ´, ÕºÕ¥Õ¿Ö? Õ§ Õ§Õ¬Õ¥Õ¯Õ¿Ö?Õ¸Õ¶Õ¡ÕµÕ«Õ¶ Õ¶Õ¡Õ´Õ¡Õ¯ Õ¸Ö?Õ²Õ¡Ö?Õ¯Õ¥Õ¬ %s: "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Õ?Õ¸Ö?Õ±Õ¥Ö? Õ¶Õ¥Ö?Õ¡Õ¼Õ¥Õ¬ Õ¸Ö?Ö?Õ¡Õ¶ Õ°Õ¶Õ¡Ö?Õ¡Õ¾Õ¸Ö? Õ§ Õ·Õ¡Õ¿ Õ¿Õ¾ÕµÕ¡Õ¬Õ¶Õ¥Ö? Õ?Õ¥Ö? Õ¤Õ¥ÕºÖ?Õ« Õ¾Õ¥Ö?Õ¡Õ¢Õ¥Ö?ÕµÕ¡Õ¬, Õ¶Õ¥Ö?Õ¡Õ¼ÕµÕ¡Õ¬ Õ¡ÕµÕ¶ bridge-Õ¶Õ¥Ö?Õ«\nÖ? Pluggable Transport-Õ¶Õ¥Ö?Õ« Ö?Õ¡Õ¶Õ¯Õ¨, Õ¸Ö?Õ¸Õ¶Ö? Ö?Õ¸Ö?Õ±Õ¥Õ¬ Õ¥Ö? Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬, Õ?Õ¥Ö? Tor Browser-Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¨,\n Ö?Õ¡Õ¶Õ¯Õ¡Ö?Õ¡Õ® Õ¡ÕµÕ¬ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¡Õ£Ö?Õ¸Ö?Õ©ÕµÕ¸Ö?Õ¶, Õ¸Ö? Tor-Õ¨ Õ°Õ¡Õ²Õ¸Ö?Õ¤Õ¥Õ¬ Õ§ Õ?Õ¥Õ¦, Ö? Õ¡ÕµÕ¬Õ¶:"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ô±Õ°Õ¡ Õ?Õ¥Ö? bridge line-Õ¥Ö?Õ¨."
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Õ?Õ¿Õ¡Ö?Õ¥Õ?Ö? Bridge-Õ¶Õ¥Ö?:"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ô½Õ¶Õ¤Ö?Õ¸Ö?Õ´ Õ¥Õ¶Ö? Õ¨Õ¶Õ¿Ö?Õ¥Õ¬ bridge-Õ« Õ¿Õ¥Õ½Õ¡Õ¯Õ« Õ¿Õ¡Ö?Õ¢Õ¥Ö?Õ¡Õ¯Õ¶Õ¥Ö?Õ¨."
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ¥Õ¶ IPv6 Õ°Õ¡Õ½Ö?Õ¥Õ¶Õ¥Ö?:"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Õ?Õ¥Õ¦ ÕºÕ¥Õ?Õ¿Ö? Õ§ %s:"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Õ?Õ¥Ö? Õ¢Ö?Õ¡Õ¸Ö?Õ¦Õ¥Ö?Õ¨ Õ¶Õ¯Õ¡Ö?Õ¶Õ¥Ö?Õ¨ Õ³Õ·Õ¿Õ¸Ö?Õ¥Õ¶ Ö?Õ¸Ö?ÕµÖ? Õ¹Õ« Õ¿Õ¡Õ¬Õ«Õ½:"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ?Ö? Õ¿Õ¡Õ¼Õ¡Õ¶Õ·Õ¡Õ¶Õ¶Õ¥Ö?Õ¨ Õ¾Õ¥Ö?Ö?Õ« Õ¶Õ¯Õ¡Ö?Õ«Ö?:"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ô»Õ¶Õ¹ÕºÕ¥Õ?Õ½ Õ½Õ¯Õ½Õ¥Õ¬ Ö?Õ£Õ¿Õ¡Õ£Õ¸Ö?Õ®Õ¥Õ¬ Õ?Õ¥Ö? bridge-Õ¶Õ¥Ö?Õ¨:"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Õ?Õ¸Ö?Õ¿Ö?Õ¡Õ£Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? bridge-Õ¶Õ¥Ö?Õ¨ Tor Browser, Õ¶Õ¡Õ Õ´Õ¿Õ¥Õ?Ö? %sTor Browser-Õ« Õ¶Õ¥Ö?Õ¢Õ¥Õ¼Õ¶Õ´Õ¡Õ¶ Õ§Õ»Õ¨%s Ö? Õ°Õ¥Õ¿Ö?Õ¥Õ?Ö? Õ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶Õ? Õ¶Õ¥Õ¢Õ¥Õ¼Õ¶Õ¥Õ¬Õ¸Ö? Ö? Õ£Õ¸Ö?Õ®Õ¡Ö?Õ¯Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Tor Browser-Õ¨:"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ÔµÖ?Õ¢ «Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?»-Õ¨ Õ¢Õ¡Ö?Õ¾Õ«Õ? Õ½Õ¥Õ²Õ´Õ¥Ö? «ԿաÖ?Õ£Õ¡Õ¾Õ¸Ö?ել» Ö? Õ°Õ¥Õ¿Ö?Õ¥Ö?\nÕ°Ö?Õ¡Õ°Õ¡Õ¶Õ£Õ¶Õ¥Ö?Õ«Õ¶ Õ´Õ«Õ¶Õ¹Ö? Õ¡ÕµÕ¶ Õ°Õ¡Ö?Ö?Õ¶Õ«."
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Õ?Õ¥Ö? Ô»Õ¶Õ¿Õ¥Ö?Õ¶Õ¥Õ¿ Ô¾Õ¡Õ¼Õ¡ÕµÕ¸Ö?Õ©ÕµÕ¸Ö?Õ¶Õ¶Õ¥Ö? Õ?Õ¡Õ¿Õ¸Ö?Ö?Õ¸Õ²Õ¨ (ISP) Õ¡Ö?Õ£Õ¥Õ¬Õ¡Ö?Õ¡Õ¯Õ¸Ö?Õ´ Õ¯Õ¡Õ´ Õ°Õ¥Õ¿Õ¡Ö?Õ¶Õ¶Õ¸Õ?Ö?Õ´ Õ§ Õ?Õ¥Ö? Õ´Õ«Õ¡Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?Õ¨\nTor Ö?Õ¡Õ¶Ö?Õ«Õ¶:"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Õ?Õ¥Õ²Õ´Õ¥Ö? «Այո», Õ«Õ½Õ¯ Õ°Õ¥Õ¿Õ¸ «Õ?Õ¡Õ»Õ¸Ö?դը»: Ô¿Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¥Õ¬Õ¸Ö? Õ°Õ¡Õ´Õ¡Ö? Õ?Õ¥Ö? Õ¶Õ¸Ö? bridge-Õ¶Õ¥Ö?Õ¨, ÕºÕ¡Õ¿Õ³Õ¥Õ¶Õ¥Ö? Ö?\nÕ¿Õ¥Õ²Õ¡Õ¤Ö?Õ¥Ö? bridge line-Õ¨ Õ¿Õ¥Ö?Õ½Õ¿Õ¡ÕµÕ«Õ¶ Õ¤Õ¡Õ·Õ¿Õ¸Ö?Õ´: Õ?Õ¥Ö?Õ»Õ¸Ö?Õ´, Õ½Õ¥Õ²Õ´Õ¥Ö? «Õ?իանալ», Ö? Ô´Õ¸Ö?Ö? ÕºÕ¡Õ¿Ö?Õ¡Õ½Õ¿ Õ¯Õ¬Õ«Õ¶Õ¥Ö?: ÔµÕ©Õ¥ Õ¹Õ¯Õ¸Õ²Õ´Õ¶Õ¸Ö?Õ¸Õ·Õ¾Õ¥Ö?Õ? Ö?Õ¸Ö?Õ±Õ¥Ö? Õ½Õ¥Õ²Õ´Õ¥Õ¬ «Õ?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¸Ö?ն»\nÕ¯Õ¸Õ³Õ¡Õ¯Õ¨ «Tor-Õ« Ö?Õ¡Õ¶Ö?Õ¡ÕµÕ«Õ¶ Õ¯Õ¡Ö?Õ£Õ¡Õ¾Õ¸Ö?Õ¸Ö?Õ´Õ¶Õ¥Ö?»-Õ¸Ö?Õ´Õ? Õ°Õ¥Õ¿Õ¡Õ£Õ¡ Ö?Õ£Õ¶Õ¸Ö?Õ©ÕµÕ¡Õ¶ Õ°Õ¡Õ´Õ¡Ö?:"
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ô´Õ«Õ´Õ¥Õ¬ Õ°Õ¡Õ½Õ¡Ö?Õ¡Õ¯ bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ô´Õ«Õ´Õ¥Õ¬ IPv6 bridge-Õ¶Õ¥Ö?Õ« Õ°Õ¡Õ´Õ¡Ö?:"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ô´Õ«Õ´Õ¥Õ¬ Pluggable Transport-Õ« Õ°Õ¡Õ´Õ¡Ö?Õ? Õ¨Õ½Õ¿ TYPE-Õ«: "
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Õ?Õ¿Õ¡Õ¶Õ¡Õ¬ BridgeDB-Õ« public Gnu-PG key-Õ« ÕºÕ¡Õ¿Õ³Õ¥Õ¶:"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
index 197ac30..4f97925 100644
--- a/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/id/LC_MESSAGES/bridgedb.po
@@ -1,20 +1,22 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# anzhyo, 2014
# Astryd Viandila Dahlan, 2015
# cholif yulian <cholifyulian123@xxxxxxxxx>, 2015
# constantius damar wicaksono <constantiusdamar@xxxxxxxxx>, 2015
-# Dwi Cahyono <dwexz_cie@xxxxxxxxx>, 2015
+# wongcie <dwexz_cie@xxxxxxxxx>, 2015
# Ferriandy Chianiago <gpl4all@xxxxxxxxx>, 2015
+# Fery Setiawan <gembelweb@xxxxxxxxx>, 2020
# ical, 2019
# Lucas Susanto <susantolucas@xxxxxxxxx>, 2018
# MasIs <is.roadster@xxxxxxxxx>, 2013
# L1Nus <multazam_ali@xxxxxx>, 2014
# Ngalim Siregar <ngalim.siregar@xxxxxxxxx>, 2015
# km242saya <pencurimangga@xxxxxxxxx>, 2014
+# Suryadi Harun <suryadiharun08@xxxxxxxxx>, 2019
# Wahyu Utomo Nurindrayanto <wahyutomo66@xxxxxxxxx>, 2016
# Yerry Borang <yerry.borang@xxxxxxxxx>, 2019
# zk, 2015
@@ -22,116 +24,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-03-23 06:24+0000\n"
-"Last-Translator: Yerry Borang <yerry.borang@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Indonesian (http://www.transifex.com/otf/torproject/language/id/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: id\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Maaf! Telah terjadi kesalahan dengan permintaan Anda."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Language"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Laporkan bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kode Sumber"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Perubahan"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontak"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Pilih Semua"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Tampilkan QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode untuk bridge Anda"
-#. 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 "Ada masalah!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
-msgstr "Ada masalah saat mengambil QRCode Anda."
+msgstr "Tampaknya ada galat kesalahan dalam mendapatkan QRCode Anda."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 ini berisi jalur bridge Anda. Scan dengan pembaca QRCode untuk menyimpan jalur bridge Anda ke dalam perangkat mobile ataupun perangkat lainnya."
+msgstr "QRCode ini berisi garis jembatan Anda. Pindai dengan pembaca QRCode untuk salin garis jembatan Anda ke perangkat seluler dan lainnya."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Belum ada bridge yang tersedia..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
-msgstr "Mungkin Anda perlu mencoba %s kembali %s dan memilih tipe bridge yang berbeda"
+msgstr " Mungkin Anda harus mencoba %s kembali %s dan memilih tipe jembatan yang berbeda!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Langkah %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Unduh %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Langkah %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Dapatkan %s bridge %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Langkah %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
@@ -140,27 +157,27 @@ msgstr "Sekarang %s tambahkan bridge ke Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%serikan saya bridge!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Pilihan Lebih Lanjut"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Tidak"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "Tidak ada"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sY%sa!"
@@ -168,69 +185,37 @@ msgstr "%sY%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sD%sapatkan Jembatan!"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ini adalah pesan otomatis; mohon untuk tidak dibalas.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Berikut jembatan Anda:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Anda telah melampaui batas yang ditetapkan. Mohon perlambat! Waktu jeda minimum antara\nsurel adalah %s jam. Semua surel lainnya selama waktu periode ini akan diabaikan."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "PERINTAH: (gabungkan PERINTAH untuk menetapkan beberapa opsi secara bersamaan)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Selamat datang di BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Saat ini mendukung transport TYPE:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hai, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Halo, kawan!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Kunci Publik"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Surel ini dihasilkan dengan pelangi, unikorn, dan kilauan\nuntuk %s pada %s jam %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -241,7 +226,7 @@ msgid ""
msgstr "BridgeDB dapat menyediakan jembatan dengan beberapa %stipe dari Pluggable Transports%s,\nyang dapat membantu mengaburkan sambungan Anda ke Tor Network, mempersulit\nsiapapun melihat lalu lintas internet Anda untuk menentukan bahwa Anda\nmenggunakan Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -253,7 +238,7 @@ msgstr "Beberapa jembatan dengan alamat IPv6 juga tersedia, walaupun beberapa Pl
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -262,134 +247,169 @@ msgid ""
"\n"
msgstr "Sebagai tambahan, BridgeDB memiliki banyak jembatan biasa saja %s tanpa\nPluggable Transports %s yang mungkin tidak terdengar keren, tapi dalam banyak kasus\nmereka masih bisa membantu untuk menghindari sensor pada internet.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Apa itu jembatan?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Jembatan %s adalah relai Tor yang membantu Anda menghindari sensor."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Saya membutuhkan cara lain untuk mendapatkan jembatan!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Cara lain untuk mendapatkan Jembatan adalah dengan mengirimkan surel ke %s.\nMohon dicatat bahwa Anda harus mengirim surel menggunakan alamat dari\nsalah satu penyedia layanan surel berikut: %s, %s atau %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Jembatan saya tidak bekerja! Saya butuh bantuan!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jika Tor Anda tidak bekerja, mohon kirim surel ke %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Coba sertakan sebanyak mungkin info tentang masalah Anda, termasuk daftar jembatan dan Pluggable Transports yang Anda coba gunakan, versi Tor Browser Anda, dan pesan apapun yang diberikan oleh Tor, dll."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Jika Peramban Tor anda tidak dapat terhubung, harap lihat pada %s dan %skami."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Berikut jembatan Anda:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Dapatkan Jembatan!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Tidak ada"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Mohon pilih opsi untuk tipe jembatan:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Apakah Anda membutuhkan alamat IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Apakah Anda membutuhkan %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Peramban Anda tidak menampilkan gambar dengan benar."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Masukkan karakter dari gambar di atas..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Cara memulai menggunakan jembatan Anda"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Untuk memasukkan jembatan ke dalam Tor Browser, pertama kunjungi %s Halaman\nunduhan Tor Browser %s dan kemudian ikuti petunjuk di sana untuk mengunduh dan\nmemulai Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ketika muncul dialog 'Pengaturan Jaringan Tor', klik 'Konfigurasi' dan ikuti\npenuntun sampai ia meminta:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Apakah Penyedia Layanan Internet (ISP) Anda menutup akses atau menyensor\nkoneksi ke jaringan Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Pilih 'Ya' dan kemudian klik 'Lanjut'. Untuk mengkonfigurasi jembatan baru Anda, salin dan\ntempel alamat jembatan ke dalam kotak teks masukan. Akhirnya, klik 'Sambung', dan\nAnda siap menjelajah! Jika Anda mengalami kesulitan, coba klik tombol 'Bantuan'\ndi penuntun 'Pengaturan Jaringan Tor' untuk petunjuk lebih lanjut."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Tampilkan pesan ini"
-
-#. 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 "Minta jembatan yang biasa."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Minta jembatan IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Minta Pluggable Transport berdasarkan TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Dapatkan salinan kunci publik GnuPG BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po
index b9c424f..e54fe76 100644
--- a/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/is/LC_MESSAGES/bridgedb.po
@@ -1,123 +1,138 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Sveinn à Felli <sv1@xxxxxxxxxxx>, 2016-2017
+# Sveinn à Felli <sv1@xxxxxxxxxxx>, 2016-2017,2019-2020
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-01-22 09:08+0000\n"
-"Last-Translator: Sveinn à Felli <sv1@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: is\n"
"Plural-Forms: nplurals=2; plural=(n % 10 != 1 || n % 100 == 11);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ã?bbs! Eitthvað fór úrskeiðis varðandi beiðnina þÃna."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Tungumál"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Tilkynna um villu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Grunnkóði"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Breytingaannáll"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Hafa samband"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Velja allt"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Birta QR-kóða"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-kóði fyrir brúarlÃnurnar þÃnar"
-#. 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 "�, æ, skrambans!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Villa kom upp þegar þú reyndar að nálgast QR-kóðann þinn."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Ã?essi QR-kóði inniheldur brúarlÃnurnar þÃnar. Skannaðu QR-kóðann með strikamerkjalesara til að afrita brúarlÃnurnar yfir á farsÃma og önnur snjalltæki."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Engar brýr eru tiltækar à augnablikinu..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr " Hugsanlega ættirðu að reyna að %s fara til baka %s og velja aðra tegund brúar!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Skref %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Sækja %s Tor-vafrann %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Skref %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Ná à %s brýr %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Skref %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Núna á að %s bæta brúnum við Tor-vafrann %s"
@@ -126,27 +141,27 @@ msgstr "Núna á að %s bæta brúnum við Tor-vafrann %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sG%sefðu mér bara brýrnar!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Nánari stillingar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ekkert"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sá!"
@@ -154,69 +169,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sN%sá à brýr"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ã?etta er sjálfvirkt skeyti; ekki svara þvÃ.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[�etta er sjálfvirkur tölvupóstur.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Hér eru brýrnar þÃnar:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Ã?ú hefur farið fram úr þér, slakaðu aðeins á! LágmarkstÃmi milli tölvupóstsendinga\ner %s klukkustundir. Allar auka-póstsendingar á þvà tÃmabili verða hunsaðar."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "SKIPUN: (sameinaðu skipanir til að skilgreina marga valkosti à einu)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkomin à BridgeDB brúagagnagrunninn!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Studdar TYPE tegundir tengileiða:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hæ, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Sæll vinur!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Dreifilyklar"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ã?essi tölvupóstur var útbúinn með öllum sÃnum göllum og gæðum\nfyrir %s hjá %s þann %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,7 +210,7 @@ msgid ""
msgstr "BridgeDB getur útbúið brýr með nokkrum %sgerðum Pluggable Transports%s\ntengileiða, sem geta hjálpað til við að fela tengingar þÃnar við Tor-netið,\ngert það enn erfiðara fyrir hvern þann sem fylgist með netumferðinni þinni\nað sjá að þú sért að nota Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -239,7 +222,7 @@ msgstr "Einhverjar brýr með IPv6 vistföngum eru einnig tiltækar, en þó eru
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -248,134 +231,169 @@ msgid ""
"\n"
msgstr "Að auki er BridgeDB með fullt af ósköp venjulegum brúm %s sem ekki nota\nPluggable Transports %s, sem gæti hljómað aðeins minna svalt, en getur samt\nhjálpað til à mörgum tilfellum til að komast framhjá ritskoðun.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Hvað eru brýr?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Brýr %s eru Tor-endurvarpar sem hjálpa þér við að komast framhjá ritskoðun."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "�g þarf einhverja aðra leið til að ná à brýr!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "�nnur leið til að ná à brýr er að senda tölvupóst til %s. Athugaðu að þú verður\nað senda tölvupóstinn með netfangi frá einhverjum að eftirtöldum póstþjónustum:\n%s, %s eða %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "�nnur leið til að ná à brýr er að senda tölvupóst til %s. Skildu viðfangsefni póstsins\neftir autt og skrifaðu \"get transport obfs4\" à meginmál skilaboðanna.\nAthugaðu að þú verður\nað senda tölvupóstinn með netfangi frá einhverjum að eftirtöldum póstþjónustum:\n%s eða %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Brýrnar mÃnar virka ekki! Ã?g þarf hjálp!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ef Tor virkar ekki, ættirðu að senda tölvupóst á %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Reyndu að hafa með eins miklar upplýsingar um aðstæður þÃnar eins og hægt er,\nþar með talið allar þær brýr og Pluggable Transport tengileiðir þú reyndir að nota,\nútgáfu Tor-vafrans, auk allra skilaboða sem komu frá Tor, o.s.frv.."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ef Tor-vafrinn þinn nær ekki að tengjast, skoðaðu þá %s og %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Hér eru brúarlÃnurnar þÃnar:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Sækja brýr!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Frátekið"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Engin"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Veldu valkosti fyrir tegund brúar:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "�arftu IPv6-vistföng?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ã?arftu %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Vafrinn þinn birtir myndir ekki rétt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Settu inn stafina úr myndinni hér að ofan..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Leiðir til að byrja að nota brýrnar þÃnar"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Til að setja brýr inn à Tor-vafrann, farðu fyrst á %s niðurhalssÃðu Tor-vafrans %s\nog farðu eftir leiðbeiningum um hvernig eigi að sækja og gangsetja hann."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ã?egar glugginn 'Netkerfisstillingar Tor' birtist, smelltu á 'Stilla' og fylgdu sÃðan\nleiðarvÃsinum þar til hann spyr:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Hindrar eða ritskoðar netþjónustuaðilinn þinn (ISP) á einhvern hátt tengingar\ninn á Tor-netið?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Biðja um ekki-villandi Tor-brýr.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Veldu 'Já' og smelltu sÃðan á 'Næsta'. Til að setja upp nýju brýrnar þÃnar, afritaðu\nog lÃmdu brúarlÃnurnar inn à textareitinn. Að lokum smellirðu á 'Tengjast', og þá\nætti allt að vera tilbúið! Ef þú lendir à vandræðum, geturðu prófað að smella á\n'Hjálp'-hnappinn à 'Netstillingar Tor'-leiðarvÃsinum."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Birtir þessi skilaboð."
-
-#. 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 "Biðja um venjulegar brýr."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Biðja um IPv6-brýr."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Biðja um Pluggable Transport tengileið eftir TYPE tegundum."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Biðja um IPv6-brýr.)"
-#. 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 "Ná à afrit af GnuPG-dreifilykli frá BridgeDB"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Biðja um villandi obfs4-brýr.)"
diff --git a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
index b42d64e..afd682d 100644
--- a/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/it/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Alberto <alberto.pilato@xxxxxxxxx>, 2015
@@ -8,7 +8,9 @@
# DarkGreninja <leonardo.pantani@xxxxxxxxx>, 2017
# fetidyoo <tru74368@xxxxxxxxx>, 2011
# Francesca Ciceri <madamezou@xxxxxxxxxx>, 2014
+# Gabriele <gabboxl0@xxxxxxxxx>, 2020
# HostFat <hostfat@xxxxxxxxx>, 2015
+# Irene Quadrelli <irene.quadrelli@xxxxxxxxx>, 2020
# ironbishop <ironbishop@xxxxxxxx>, 2011
# ironbishop <ironbishop@xxxxxxxx>, 2011
# Jacob Appelbaum <jacob@xxxxxxxxxxxxx>, 2009
@@ -19,123 +21,138 @@
# Alessandro Manfredi <a.n0on3@xxxxxxxxx>, 2011
# Paolo Stivanin <paolostivanin@xxxxxxxxx>, 2014
# Random_R, 2013
-# Random_R, 2013-2015
-# Sebastiano Pistore <SebastianoPistore.info@xxxxxxxxxxxxx>, 2018
+# Random_R, 2013-2015,2019-2020
+# SebastianoPistore <SebastianoPistore.info@xxxxxxxxxxxxx>, 2018
# fetidyoo <tru74368@xxxxxxxxx>, 2011
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-06-05 09:40+0000\n"
-"Last-Translator: Gio Doro <CyberMatique@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-16 16:43+0000\n"
+"Last-Translator: Irene Quadrelli <irene.quadrelli@xxxxxxxxx>\n"
"Language-Team: Italian (http://www.transifex.com/otf/torproject/language/it/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: it\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Siamo spiacenti ma qualcosa è andato storto con la tua richiesta."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Lingua"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Segnala un Problema"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Codice sorgente"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Novità "
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contatti"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Seleziona tutto"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostra Codice QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Codice QR per le tue 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 "Figo!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Sembra che ci sia stato un errore nell'ottenere il tuo QRCode."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Questo codice QR contiene le tue linee ponte. Scansionalo con un lettore QR per copiare le tue linee ponte sul telefono cellulare o su altri dispositivi."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ha riscontrato un problema "
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Non ci sono bridge disponibili al momento..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Potresti provare a %s tornare indietro %s e scegliere un tipo di bridge diverso!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Passo %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Scarica %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Passo %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Ottenere dei %s bridge %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Passo %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
@@ -144,27 +161,27 @@ msgstr "Ora %s aggiungi i bridge al Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sD%sammi i bridge e basta!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opzioni Avanzate"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "No"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "nessuno"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sì!"
@@ -172,69 +189,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sttieni Bridge"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Questo è un messaggio inviato automaticamente, si prega di non rispondere.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Questa è un'email automatica.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ecco i tuoi bridge:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Hai superato il limite massimo di email. Per favore rallenta! Il tempo minimo tra le email è di %s ore. Tutte le altre email che verranno inviate durante questo periodo di tempo verranno ignorate."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combina i COMMANDs per specificare opzioni multiple simultaneamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Benvenuto/a su BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs attualmente supportati:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hey, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ciao amico!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Chiavi Pubbliche"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Questa email è stata generata con arcobaleni, unicorni e scintille\nper %s il %s alle %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Se questi bridge non sono ciò che ti serve, rispondi a questa email con uno\ndei seguenti comandi nel corpo del messaggio:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -245,7 +230,7 @@ msgid ""
msgstr "BridgeDB può fornire dei bridge con numerosi %stipi di Pluggable Transports%s,\ni quali possono aiutare ad offuscare la tua connessione alla Rete Tor, rendendo\npiù difficile a chiunque vedere il tuo traffico internet per determinare che stai\nusando Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -257,7 +242,7 @@ msgstr "Sono disponibili anche alcuni bridge con indirizzi IPv6, sebbene alcuni
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -266,134 +251,169 @@ msgid ""
"\n"
msgstr "In aggiunta, BridgeDB ha anche numerosi bridge vanilla %s senza alcun\nPluggable Transports %s, il che forse non suona bene, ma possono ancora\naiutare ad aggirare la censura in internet in molti casi.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Cosa sono i bridge?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridge %s sono relay di Tor che ti aiutano ad aggirare la censura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Mi serve un altro modo per avere dei bridge!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Un altro modo di ottenere i bridge è inviare un'email a %s. Nota che devi\ninviare l'email usando uno degli indirizzi tra i seguenti provider email:\n%s, %s o %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Un altro modo di ottenere bridge è inviare un'email a %s. Lascia vuoto l'oggetto \ndell'email e scrivi \"get transport obfs4\" nel corpo del messaggio. Tieni presente\nche devi inviare il messaggio usando un indirizzo tra uno dei seguenti fornitori \ndi email: %s o %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "I miei bridge non funzionano! Mi serve aiuto!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se Tor non ti funziona, manda un'email a %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Cerca di includere più informazioni possibili sul tuo caso, incluso l'elenco di\nbridge e Pluggable Transports che hai provato a usare, la versione di Tor Browser,\nqualsiasi messaggio ti abbia mostrato Tor, ecc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Se Tor Browser non riesce a connettersi, dai un'occhiata al %s e al nostro %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ecco le tue linee bridge:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ottieni dei Bridge!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Meccanismi di distribuzione del bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementa quattro meccanismi per distribuire i bridge: \"HTTPS\", \"Moat\",\n\"Email\", e \"Riservato\". I bridge che non sono distribuiti da BridgeDB usano\nlo pseudo-meccanismo \"Nessuno\". La seguente lista spiega in breve come funzionano\nquesti meccanismi e le nostre %smetriche BridgeDB%s mostrano quanto sia popolare\nogni meccanismo."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Il meccanismo di distribuzione \"HTTPS\" fornisce i bridge attraverso questo sito. Per ottenere\nbridge, vai su %sbridges.torproject.org%s, seleziona le tue opzioni preferite e\nrisolvi il CAPTCHA che segue."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Il meccanismo di distribuzione \"Moat\" è parte di Tor Browser, consentendo agli utenti di\nrichiedere bridge all'interno delle impostazioni di Tor Browser. Per ricevere bridge, vai alle\n%simpostazioni Tor%s di Tor Browser, clicca \"richiedi un nuovo bridge\", risolvi il\nCAPTCHA che segue e Tor Browser aggiungerà automaticamente i tuoi nuovi\nbridge."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Gli utenti possono richiedere bridge con il meccanismo di distribuzione \"Email\" inviando\nun'email a %sbridges@xxxxxxxxxxxxxx%s e scrivendo \"get transport obfs4\" nel\ncorpo del messaggio."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Riservato"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB mantiene un piccolo numero di bridge che non vendono distribuiti\nautomaticamente. Piuttosto, riserviamo quei bridge per la distribuzione a mano e\nli forniamo alle NGO ed altre organizzazioni e individui che hanno bisogno dei\nbridge. I bridge distribuiti con il meccanismo \"Riservato\" potrebbero non\nvedere utenti per molto tempo. Nota che il meccanismo di distribuzione \"Riservato\" è\nchiamato \"Non allocato\" nei file di %sassegnazione pool bridge%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nessuno"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "I bridge con il meccanismo di distribuzione \"Nessuno\" non sono distribuiti da BridgeDB.\n� responsabilità dell'operatore del bridge di distribuire i suoi bridge agli\nutenti. Nota che sulla Ricerca Relay, un meccanismo di distribuzione\nappena configurato dirà \"Nessuno\" per circa un giorno. Porta un po' di pazienza\ne poi cambierà al vero meccanismo di distribuzione del bridge.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Seleziona le opzioni per il tipo di bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ti servono indirizzi IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ti serve un %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Il tuo browser non mostra le immagini in modo corretto."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Inserisci i caratteri nell'immagine sopra..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Come iniziare a usare i tuoi bridge"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Per inserire i bridge in Tor Browser, prima vai nella %s pagina di download di\nTor Browser %s e poi segui lì le istruzioni per scaricare ed avviare Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Per prima cosa devi %sscaricare Tor Browser%s. Il nostro manuale utente\n di Tor Browser spiega come puoi aggiungere bridge a Tor Browser. Se stai\n usando Windows, Linux o OS X, %sclicca qui%s per maggiori info. Se\n stai usando Android, %sclicca qui%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Quando appare la finestra delle 'Impostazioni Rete Tor', clicca 'Configura' e\nsegui la procedura giudata finchè non chiede:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Aggiungi questi bridge a Tor Browser aprendo le preferenze\ndel browser, cliccando su \"Tor\" e poi aggiungendoli nel campo\n\"Fornisci un bridge\"."
-#. 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 "Il tuo Internet Service Provider (ISP) blocca o censura le connessioni alla\nrete Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Richiedi bridge Tor non offuscati.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Seleziona 'Sì' e poi clicca 'Avanti'. Per configurare i nuovi bridge, copia e\nincolla le linee bridge nella casella di testo. Infine, clicca 'Connetti' e dovrebbe\nessere tutto pronto! Se avrai problemi, prova a cliccare il pulsante 'Aiuto'\nnella procedura guidata 'Impostazioni Rete Tor' per avere assistenza."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Mostra questo messaggio."
-
-#. 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 "Richiedi bridge vanilla."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Richiedi bridge IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Richiedi un Pluggable Transport by TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Richiedi bridge IPv6.)"
-#. 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 "Ottieni una copia della chiave pubblica GnuPG di BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Richiedi bridge offuscati obfs4.)"
diff --git a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
index 6979bb4..6bac884 100644
--- a/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ja/LC_MESSAGES/bridgedb.po
@@ -1,130 +1,147 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
+# 323484, 2020
# 323484, 2018
# brt <87@xxxxxxxxxxx>, 2013
# ABE Tsunehiko, 2014-2015
# azumukupoe, 2017
# ã?¿ã?«ã??ã?· <indexial@xxxxxxxxxx>, 2013
# ã?¿ã?«ã??ã?· <indexial@xxxxxxxxxx>, 2014
+# h345u37g3 h345u37g3, 2019
# Masaki Saito <rezoolab@xxxxxxxxx>, 2013
# è?¤å??ã??ç?² <m1440809437@xxxxxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ja\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ç?³ã??訳ã??ã??ã?¾ã??ã??ï¼?ã?ªã?¯ã?¨ã?¹ã??ã?«å??é¡?ã??ã??ã??ã?¾ã??ã??ã??"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "��"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ã??ã?°ã??å ±å??ã??ã??"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ã?½ã?¼ã?¹ã?³ã?¼ã??"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "å¤?æ?´å±¥æ´"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ã??å??ã??å??ã??ã??"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "ã??ã?¹ã?¦é?¸æ??"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
-msgstr "QR ã?³ã?¼ã??ã??表示"
+msgstr "QRã?³ã?¼ã??ã??表示"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+msgstr "ã??ã?ªã??ã?¸ã?®QRã?³ã?¼ã??"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "QR ã?³ã?¼ã??ã??ä½?æ??ã??ã??é??ã?«ã?¨ã?©ã?¼ã??ç?ºç??ã??ã?¾ã??ã??ã??"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 ã?³ã?¼ã??ã?¯ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??å?«ã?¿ã?¾ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§èªã?¿è¾¼ã??ã??ã?¨ã?§ã??ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã??ã?³ã??ã?¼ã?§ã??ã?¾ã??ã??"
+msgstr "ã??ã?®ã??ã?ªã??ã?¸ã?®QRã?³ã?¼ã??ã??æ?ºå¸¯ç«¯æ?«ã?ªã?©ã?®ã??ã??ã?¤ã?¹ã?§èªã?¿è¾¼ã??ã??ã?¨ã??ã?£ã?¦ã??ã??ã?ªã??ã?¸ã??ã?³ã??ã?¼ã??ã??ã??ã?¨ã??ã?§ã??ã?¾ã??ã??"
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "ä»?ã?®æ??ç?¹ã?§ã?¯å?©ç?¨ã?§ã??ã??ã??ã?ªã??ã?¸ã??ã??ã??ã?¾ã??ã??..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ã?¹ã??ã??ã?? %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser %s ã??ã??ã?¦ã?³ã?ã?¼ã??"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ã?¹ã??ã??ã?? %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s ã??ã?ªã??ã?¸ %s ã??æ??ã?«å?¥ã??ã??"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "ã?¹ã??ã??ã?? %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??追å? ã??ã?¾ã?? %s"
@@ -133,27 +150,27 @@ msgstr "%s Tor Browser ã?«ã??ã?ªã??ã?¸ã??追å? ã??ã?¾ã?? %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
-msgstr "%sã??%sã?®ã??ã??ã? ã??ã??ã?? bridges!"
+msgstr "%sè¨%så®?ã?ªã??ã?®ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "é«?度ã?ªè¨å®?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "ã??ã??ã??"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ã?ªã??"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sã?¯%sã??ï¼?"
@@ -161,69 +178,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
+msgstr "%sã??%sã?ªã??ã?¸ã??å?¥æ??ã??ã??"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ã??ã?®ã?¡ã?¼ã?«ã?¯è?ªå??é??ä¿¡ã??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ã?§ã??ã??è¿?ä¿¡ã??ã?ªã??ã?§ã??ã? ã??ã??ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
-msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?¯ã??ã?¡ã??:"
+msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ï¼?"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 æ??é??ã?§ã??ã??ã??ã?®æ??é??ä¸ã?«ã??ã??ã?«é??ä¿¡ã??ã??ã?¡ã?¼ã?«ã?¯å?¨ã?¦ç?¡è¦?ã??ã??ã?¾ã??ã??"
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "ã?³ã??ã?³ã??: (ã?³ã??ã?³ã??ã??çµ?ã?¿å??ã??ã??ã?¦ã??å??æ??ã?«è¤?æ?°ã?®ã?ªã??ã?·ã?§ã?³ã??æ??å®?ã??ã??)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB ã?¸ã??ã??ã??ã??ï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?¾å?¨ã?µã??ã?¼ã??ã??ã??ã?¦ã??ã??ã??ã?©ã?³ã?¹ã??ã?¼ã??ã?¿ã?¤ã??:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ã?©ã??ã?? %s ã??ã??ï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ã?©ã??ã??ã??ã??ã??ã?«ã?¡ã?¯ï¼?"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "ã??ã?®ã?¡ã?¼ã?«ã?¯ %s ã?« %s %s ã?« rainbow å??ã?³ unicorn ã?? sparkle ã?§ç??æ??ã??ã??ã?¾ã??ã??ã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -231,10 +216,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB ã?¯ã??%sã?¿ã?¤ã??ã?® Pluggable Transports%s ã?§ã??ã?ªã??ã?¸ã??æ??ä¾?ã??ã?¾ã??ã??\nTor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??æ??ã??ã??ã?¥ã??ã??ã??ã??ã??ã?¨ã?«å½¹ç«?ã?¡ã??ã??ã?ªã??ã?®\nã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?©ã??ã?£ã??ã?¯ã??ç?£è¦?ã??ã?¦ã??ã??誰ã??ã??ã??ã?ªã??ã?? Tor ã??使ç?¨ã??ã?¦ã??ã??ã??ã?¨ã??å?¤å?¥ã??ã??ã??ã?¨ã??ã??ã??ã?«é?£ã??ã??ã?ªã??ã?¾ã??ã??\n\n"
+msgstr "BridgeDB ã?¯ã??%sPluggable Transportsã?¿ã?¤ã??%s ã?§ã??ã?ªã??ã?¸ã??æ??ä¾?ã??ã?¾ã??ã??\nã??ã?ªã??ã?®Tor Networkã?¸ã?®æ?¥ç¶?ã?®æ¤?å??ã??å??é?¿ã??ã??\nã??ã?ªã??ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã??ã?©ã??ã?£ã??ã?¯ã??ç?£è¦?ã??ã?¦ã??ã??誰ã??ã??ã??ã?ªã??ã?? Tor ã??使ç?¨ã??ã?¦ã??ã??ã??ã?¨ã??å?¤å?¥ã??ã??ã??ã?¨ã??ã??ã??ã?«é?£ã??ã??ã??ã?¾ã??ã??\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -246,143 +231,178 @@ 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "å? ã??ã?¦ã?? BridgeDB ã?¯ã?? %s Pluggable Transport %s ã?®ã?ªã??å¤?ã??ã?®ä½?ã?®å¤?å?²ã??ã?ªã??\né??常ã?®ã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã?¯ã?¼ã?«ã?«ã?¯æ??ã??ã?ªã??ã??ã??ã??ã??ã?¾ã??ã??ã??ã??ã??ã??ã??å¤?ã??ã?®å ´å??ã??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
+msgstr "å? ã??ã?¦ã?? BridgeDB ã?¯ã?? %sPluggable Transportã?®ã?ªã??%s ã??ã??ã?©ã?¢ã?¤ã?¹ã?®ã??ã??ã?«ã??ã??ã?¬ã?¼ã?³ã??ã?ª\nã??ã?ªã??ã?¸ã??æ??ã?¡ã??ã??ã??ã?¯ã??ã?¾ã??å®?ç?¨æ?§ã??ã?ªã??ã??ã??ã?§ã??ã??ã??å®?é??ã?¯å¤?ã??ã?®å ´å??ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??ã?®ã?«ã?ªã??æ??å?¹ã?§ã??ã??\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ã??ã?ªã??ã?¸ã?¨ã?¯ï¼?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s ã??ã?ªã??ã?¸ %s ã?¯ã?? ã?¤ã?³ã?¿ã?¼ã??ã??ã??æ¤?é?²ã??å??é?¿ã??ã??å?©ã??ã?¨ã?ªã?? Tor ã?ªã?¬ã?¼ã?§ã??ã??"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
-msgstr "ã??ã?ªã??ã?¸ã??å¾?ã??ä»?ã?®æ?¹æ³?ã??å¿?è¦?ã?§ã??!"
+msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ã??ã??å?¥ã?®æ?¹æ³?ã??å¿?è¦?ã?ªå ´å??"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 ã?¾ã?§ã?¡ã?¼ã?«ã??é??ã??ã??ã?¨ã?§ã??ã??\n以ä¸?ã?®ã?¡ã?¼ã?«ã??ã?ã??ã?¤ã??ã?®ã??ã?¡ã?®1ã?¤ã?®ã?¢ã??ã?¬ã?¹ã??使ç?¨ã??ã?¦ã?¡ã?¼ã?«ã??é??ä¿¡ã??ã?ªã??ã??ã?°ã?ªã??ã?ªã??ã??ã?¨ã?«ã??注æ??ã??ã? ã??ã??:\n %s ã?? %s ã?¾ã??ã?¯ %s"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "ç§?ã?®ã??ã?ªã??ã?¸ã??å??ã??ã?¾ã??ã??! å?©ã??ã?¦ã??ã? ã??ã??!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor ã??ã??ã?¾ã??å??ä½?ã??ã?ªã??å ´å??ã?? %s ã?¾ã?§ã?¡ã?¼ã?«ã??ä¸?ã??ã??ã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 ã??å?ºå??ã??ã??ã?¡ã??ã?»ã?¼ã?¸ç?ã?ªã?©ã??å?«ã?¿ã??å?ºæ?¥ã??é??ã??ã??ã?ªã??ã?®ã?±ã?¼ã?¹ã?«é?¢ã??ã??å¤?ã??ã?®æ??å ±ã??å?«ã??ã?¦ã?¿ã?¦ã??ã? ã??ã??ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "ã??ã??ã??ã?ªã??ã?® Tor Browser ã??æ?¥ç¶?ã?§ã??ã?ªã??å ´å??ã?¯ã??%sã??ç§?é??ã?®%sã??ã??覧ã??ã? ã??ã??ã??"
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
-msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ã?©ã?¤ã?³ã?¯ã??ã?¡ã??ã?§ã??:"
+msgstr "ã??ã?ªã??ã?®ã??ã?ªã??ã?¸ï¼?"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "ã??ã?ªã??ã?¸ã??å?¥æ??ï¼?"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "ã?ªã??"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "ã??ã?ªã??ã?¸ã?¿ã?¤ã??ã?®ã?ªã??ã?·ã?§ã?³ã??é?¸æ??ã??ã?¦ã??ã? ã??ã??:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 ã?¢ã??ã?¬ã?¹ã??å¿?è¦?ã?§ã??ã??ï¼?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "%s ã??å¿?è¦?ã?§ã??ã??ï¼?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "ã??å?©ç?¨ã?®ã??ã?©ã?¦ã?¶ã?¯é?©å??ã?«ç?»å??ã??表示ã??ã?¦ã??ã?¾ã??ã??ã??"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "ä¸?è¨?ã?®ç?»å??ã??ã??æ??å?ã??å?¥å??ã??ã?¦ã??ã? ã??ã??..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "ã??ã?ªã??ã?¸ä½¿ç?¨ã?®å§?ã??æ?¹"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Tor Browser ã?«ã??ã?ªã??ã?¸ã??ç?»é?²ã??ã??å??ã?«ã??ã?¾ã??ã?¯ %s Tor Browser ã??ã?¦ã?³ã?ã?¼ã??ã??ã?¼ã?¸ %s ã?«ç§»å??ã??ã?¦ Tor Browser ã?®ã??ã?¦ã?³ã?ã?¼ã??æ?¹æ³?ã?¨å§?ã??æ?¹ã?®èª¬æ??ã??ã??覧ã??ã? ã??ã??ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ã??Tor ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã??ã?¤ã?¢ã?ã?°ã??ã??ã??ã??ã?¢ã??ã??ã??ã??é??ã??è¨å®?ã??ã?¯ã?ªã??ã?¯ã??ã?¦\nè??ã??ã??ã??ã?¾ã?§ã?¦ã?£ã?¶ã?¼ã??ã?«å¾?ã?£ã?¦ã??ã? ã??ã??ã??"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "ã??å?©ç?¨ã?®ã?¤ã?³ã?¿ã?¼ã??ã??ã??ã?µã?¼ã??ã?¹ã??ã?ã??ã?¤ã??ã?¼ (ISP) ã?¯ Tor ã??ã??ã??ã?¯ã?¼ã?¯ã?¸ã?®æ?¥ç¶?ã??ã??ã?ã??ã?¯ã?ªã??ã??\nå?¥ã?®ã??ã??æ?¹ã?§æ¤?é?²ã??ã?¦ã??ã?¾ã??ã??ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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 ã??ã??ã??ã?¯ã?¼ã?¯è¨å®?ã??ã?¦ã?£ã?¶ã?¼ã??å??ã??ã??ã?«ã??ã??ã??ã?¿ã?³ã??ã?¯ã?ªã??ã?¯ã??ã?¦ã??ã? ã??ã??ã??"
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "vanilla ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 ã??ã?ªã??ã?¸ã??ã?ªã?¯ã?¨ã?¹ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "ã?¿ã?¤ã??ã??ã?¨ã?« Pluggable Transport ã??ã?ªã?¯ã?¨ã?¹ã??"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "BridgeDB ã?® GnuPG å?¬é??é?µã?®ã?³ã??ã?¼ã??æ??ã?«å?¥ã??ã?¾ã??ã??ã??ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po
index b802e44..4d45ebe 100644
--- a/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ka/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Georgianization, 2018
# George Rommel <x0rmia@xxxxxxxxx>, 2013
+# Georgianization, 2019-2020
# Shanidze <sandro.shanidze@xxxxxxxxx>, 2015
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: Georgianization\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Georgian (http://www.transifex.com/otf/torproject/language/ka/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ka\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "á?£á??á??á?ªá? á??á??á??á??! á??á?¥á??á??á??á?¡ á??á??á??á?®á??á??á??á??á?¡á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á??á?? á? á??á?¦á??á?ª á??á??á? á??á??."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "á??á??á??"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "á?®á??á? á??á??á??á??á?¡ á??á??á?®á?¡á??á??á??á??á??"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "á??á??á? á??á??á??á?¬á?§á??á? á?? á??á??á??á??"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "á?ªá??á??á??á??á??á??á??á??á??"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "á??á??á??á?¨á??á? á??"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "á?§á??á??á??á??á?¡ á??á??á??á??á?¨á??á??á??"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR-á??á??á??á??á?¡ á?©á??á??á??á??á??á??"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "á? á??á??á??á? á?ª á?©á??á??á?¡, á? á??á?¦á??á?ª á?¨á??á?ªá??á??á??á?? á?¬á??á? á??á??á??á?¨á??á?? QR-á??á??á??á??á?¡ á??á??á?¦á??á??á??á?¡á??á?¡."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "á??á??á??á??á??á??á?? á??á? á?ªá??á? á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á?? á??á? á??á?? á?®á??á??á??á??á?¡á??á?¬á??á??á??á??á??..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "á??á??á??á??á?¯á?? %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "á?©á??á??á??á?¢á??á??á? á??á??á?? %s Tor-á??á? á??á?£á??á??á? á?? %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "á??á??á??á??á?¯á?? %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "á??á??á??á?¦á??á?? %s á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "á??á??á??á??á?¯á?? %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "á??á?®á??á?? %s á??á??á??á??á??á?¢á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ %s"
@@ -128,27 +144,27 @@ msgstr "á??á?®á??á?? %s á??á??á??á??á??á?¢á??á?? á??á??á??á??á??á?ªá??á??á?? á?®
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sá?£%sá??á? á??á??á??á?? á??á??á??á??á?ªá??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "á??á??á??á??á?¢á??á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á??"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "á??á? á??"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "á??á? á?ªá??á? á??á??"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sá??%sá??á??á?®!"
@@ -156,69 +172,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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 "[á??á?¡ á??á??á?¢á??á??á??á?¢á?£á? á?? á?¬á??á? á??á??á??á??; á??á??á?®á??á??á?? á??á?£ á??á??á??á??á??á?®á??á??á?£á? á??á??á??á??.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[á??á?¡ á??á??á?¢á??á??á??á?¢á?£á? á?? á?¬á??á? á??á??á??á??.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "á??á?¥á??á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 á?¡á??á??á??á??á?¡ á?¨á??á??á??á??á??. á?§á??á??á??á?? á?¬á??á? á??á??á?? á??á?? á?¨á?£á??á??á??á??á??á?¡ á??á??á??á??á??á??á??á??á??á??á?¨á??, á?£á??á?£á??á??á??á??á??á?§á??á?¤á??á??á?? á??á?¥á??á??á??á??."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (COMMANDs á??á? á??á??á??á??á??á??á?? á??á??á??á??á?§á??á??á??á??á??á?? á? á??á??á??á??á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á?¡ á??á? á??á??á? á??á?£á??á?? á??á??á??á??á??á??á??á??á?? á?¨á??á?¡á??á?«á??á??á??á??á??á??)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "á??á??á??á??á?¡á??á??á??á??á??á??á?? BridgeDB-á?¨á??!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "á??á??á??á??á??á??á?? á??á?®á??á? á??á??á?á??á? á??á??á?? á??á??á??á??á?ªá??á??á??á?¡ á?¡á??á?®á??á??á??á?? (TYPE):"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "á??á??á??á??á? á?¯á??á??á??, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "á??á??á??á??á?¡á??á??á??á??á??á??á??, á??á??á??á??á??á??á? á??!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "á??á?¡ á?¬á??á? á??á??á?? á?¨á??á??á?¥á??á??á?? á?ªá??á?¡á??á? á?¢á?§á??á??á??á?¡ á?¤á??á? á??á??á??á??, á??á?¦á??á??á? á?£á??á?? á??á? á?¡á??á??á??á??á??á??á?? á??á?? á??á? á?á?§á??á??á??á??á??á??á??á??\n%s-á??á?¡á??á??á??á?¡, á??á??á? á??á?¦á?? %s, á??á? á?? %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "á??á?¡ á?®á??á??á??á??á?? á??á?£ á??á? á??á??á?¡á??á?á??á? á??á??á??á??á??, á??á??á??á??á??á??á??á??á??á??á?? á??á??á?¡á?£á?®á?? á??á?? á??á??á?¤á??á?¡á?¢á??á??á??\ná?¨á??á??á??á??á??á?? á??á? á?«á??á??á??á??á??á??á??á?? á?¬á??á? á??á??á??á?¡ á?¨á??á??á??á??á??á?¡á?¨á??:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +213,7 @@ msgid ""
msgstr "BridgeDB á??á??á??á??á??á??á??á??á?? á? á??á??á??á??á??á??á??á?? %sá?¡á??á?®á??á?¡ á??á??á?¡á??á??á? á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á?¡ (Pluggable Transports)%s,\ná? á??á??á??á??á??á?ª á??á??á??á??á?®á??á??á? á??á??á??á?? á??á??á??á??á??á??á?? á??á?¥á??á??á??á?? á??á??á??á?¨á??á? á??á??á?? Tor-á?¥á?¡á??á??á??á??á??, á??á?¡ á??á?? á??á??á?¢á??á??\ná??á??á?£á? á??á?£á??á??á??á?¡ á??á?¥á??á??á??á?? á?¥á?¡á??á??á??á?¡ á??á??á??á??á?§á?£á? á??á?¡á??á??á??á??á??á??á??á??á??á?¡ á?¨á??á?¡á??á?«á??á??á??á??á??á??á??á?¡,\ná??á??á??á??á??á??á??á??á??, á?®á??á? á?? á??á?£ á??á? á?? Tor-á??á??á?? á??á??á??á??á??á?¨á??á? á??á??á?£á??á??.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -241,7 +225,7 @@ msgstr "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¬á??á??á?? IPv
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +234,169 @@ msgid ""
"\n"
msgstr "á??á??á??á?¡á??á??á??, BridgeDB-á?¡ á??á??á??á?©á??á??á?? á?£á??á??á? á??á??á?? á?©á??á??á?£á??á??á??á? á??á??á?? á?¡á??á?®á??á?¡ á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?ª %sá?§á??á??á??á??á??á??á??á? á??\ná??á??á?¡á??á??á? á??á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á??á?¡ (Pluggable Transports) á??á??á? á??á?¨á??, %s á? á??á?ª á??á? á?ª á??á?¡á?? á?¨á??á??á??á??á??á?á??á??á??á??á?? á??á??á??á??á??á??á?¥á??á??á?¡, á??á?£á??á?ªá?? á??á??á??á??á?ª á??á??á??á??á?¡á??á??á??á??á??á??\ná??á??á?¢á??á? á??á??á?¢á??á?¡ á?¨á??á??á?¦á?£á??á??á??á??á??á?¡á??á??á??á?¡ á??á??á??á??á?¡ á??á?¡á??á? á??á??á??á??á??á??á?? á??á? á??á??á? á?? á?¨á??á??á??á?®á??á??á??á??á?¨á??.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "á? á??á?¡ á?¬á??á? á??á??á??á??á??á??á??á?¡ á?®á??á??á??á??á???"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s á?®á??á??á??á??á?? %s á??á? á??á?¡ Tor-á??á?¡ á??á??á??á??á??á?ªá??á??á??á??á??, á? á??á??á??á??á??á??á?ª á??á??á?®á??á??á? á??á??á??á?? á??á??á??á? á??á?? á??á?£á??á? á??á?? á?¨á??á??á?¦á?£á??á??á??á??á?¡."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "á?¡á?®á??á?? á??á??á??á??á?? á??á??á?¡á??á?á??á? á??á??á??á?? á??á??á??á??á??á?ªá??á?? á?®á??á??á??á??á??á??á?? á?¬á??á??á??á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á??!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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. á??á??á?®á??á??á?? á??á??á??á??á??á??á??á??á?¡á?¬á??á??á??á??, á? á??á?? á?¬á??á? á??á??á?? á??á??á??á??á??á??á??á??á??á??á??á?? á?£á??á??á?? á??á?§á??á?¡ á??á??á?¤á??á?¡á?¢á??á?¡ á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á? á??á??á??á??á??á??á?? á??á?? á??á??á??á?¬á??á??á??á??á??á??á?¡ á?¤á??á?¡á?¢á??á??á??á??:\n%s, %s á??á?? %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "á?®á??á??á??á??á??á?¡ á??á??á?¦á??á??á??á?¡ á??á??á??, á?¤á??á?¡á?¢á??á?? á??á??á?¬á??á? á??á?ªá??á?? á??á??á?¡á??á??á??á? á??á??á?? %s. á??á??á?¢á??á??á??á?? á??á??á??á??á?¡\ná??á??á??á?? á?ªá??á? á??á??á??á?? á??á?? á?©á??á?¬á??á? á??á?? â??get transport obfs4â?? á?¬á??á? á??á??á?¨á??, á??á??á??á??á??á??á??á??á?¡á?¬á??á??á??á??,\ná? á??á?? á??á??á??á??á??á??á??á??á??á?? á?¨á??á??á??á?«á??á??á??á?? á??á??á?¤á??á?¡á?¢á??á?¡ á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á? á??á??á??á??á??á??á?? á??á??\ná??á??á??á?¬á??á??á??á??á??á??á?¡á??á??á??: %s á??á?? %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "á?©á??á??á?? á?®á??á??á??á??á?? á??á? á??á?£á?¨á??á??á??á?¡! á??á??á?®á??á??á? á??á??á?? á??á?á??á? á??á??á??á??!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "á??á?£ á??á?¥á??á??á??á?? Tor á??á? á??á?£á?¨á??á??á??á?¡, á??á??á??á??á??á??á??á??á??á??á?? á??á??á?¤á??á?¡á?¢á?? %s á??á??á?¡á??á??á??á? á??á??á??."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "á?¨á??á??á?ªá??á??á??á?? á??á??á?¢á??á?? á??á? á?ªá??á??á?? á??á?¦á?¬á??á? á??á?? á??á?¥á??á??á??á?? á?¨á??á??á??á?®á??á??á??á?? á??á?? á??á??á?£á? á??á??á?? á?¡á??á?? á??á??\ná??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡á?? á??á?? á??á??á?¡á??á??á? á??á??á??á??á??á?? á??á??á??á??á??á?§á??á??á??á??á??á??á?¡ (Pluggable Transports) \ná? á??á??á??á??á?¡ á??á??á??á??á?§á??á??á??á??á??á?ª á?¡á?ªá??á??á??á??, á??á??á??á?¡á??á??á?? á??á?¥á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ á??á??á? á?¡á??á??, á?§á??á??á??á?? á?¨á??á?¢á?§á??á??á??á??á??á??á??, á? á??á?ª Tor-á??á?? á??á??á?©á??á??á??á??á?? á??á?? á??.á?¨."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "á??á?£ á??á?¥á??á??á??á?? Tor-á??á? á??á?£á??á??á? á?? á??á??á? á?£á??á??á??á?¨á??á? á??á??á??á??, á??á??á?®á??á??á?? á??á?®á??á??á??á?? %s á??á?? á?©á??á??á??á?? %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "á??á?¥ á??á? á??á?¡ á??á?¥á??á??á??á?? á?¡á??á?®á??á??á?? á?®á??á??á??á??á??:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "á??á??á??á?¦á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "á?®á??á??á??á?¡ á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á??á??"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB á??á??á? á??á??á??á?¡ á??á??á?® á?¡á??á?¨á?£á??á??á??á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á?¡á??á??á? á?ªá??á??á??á??á??á??á??: â??HTTPSâ??, â??Moatâ??,\nâ??Emailâ??, á??á?? â??Reservedâ??. á?®á??á??á??á??á??, á? á??á??á??á??á??á??á?ª á??á? á??á? á?ªá??á??á??á??á??á?? BridgeDB-á??á??, á??á?§á??á??á??á??á?¡\ná?ªá? á?£-á?¡á??á?¨á?£á??á??á??á??á??á?¡ â??Noneâ??. á??á??á?ªá??á??á?£á??á?? á?©á??á??á??á??á??á??á??á??á??á?? á??á??á? á?¢á??á??á??á?? á?®á?¡á??á??á?¡ á??á?£ á? á??á??á??á? \ná??á?£á?¨á??á??á??á?¡ á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á??á??, á?©á??á??á??á?? %sBridgeDB-á??á??á??á??á??á??á??á??á??%s á??á?? á??á?¡á??á?®á??á??á?¡ á? á?? á?¡á??á?®á?¨á??á? á??á?? á??á??á??á??á??á?§á??á??á??á??á??\ná??á??á??á??á??á?£á??á?? á??á??á??á??á??á??á??."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "â??HTTPSâ?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á?? á??á??á??á??á?¡á?ªá??á??á?¡ á?®á??á??á??á??á?¡ á??á??á??á?¡á??á??á?¢á??á??á??á??. á?®á??á??á??á??á??á?¡\ná??á??á?¡á??á?¦á??á??á??á??, á??á??á?®á?¡á??á??á??á?? %sbridges.torproject.org%s, á??á??á? á?©á??á??á?? á?¡á??á?¡á?£á? á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á?? á??á?? \ná?¨á??á??á??á??á??á?? á??á??á??á?®á?¡á??á??á??á?? CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "â??Moatâ?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??, á??á??á?¬á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡, á??á??á?¡á??á?? á??á??á??á?®á??á??á? á??á??á??á??á??á?¡ \ná?¨á??á?£á?«á??á??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á??á??á??á??á??. á?®á??á??á??á??á??á?¡ á??á??á?¡á??á?¦á??á??á??á??, á??á??á?®á?¡á??á??á??á??\ná??á?¥á??á??á??á?? Tor-á??á? á??á?£á??á??á? á??á?¡ %sTor-á??á??á? á??á??á??á?¢á? á??á??á??%s, á??á??á?¬á??á??á??á??á?? â??á??á?®á??á??á?? á?®á??á??á??á?¡ á??á??á??á?®á??á??á??á??â??, á??á??á??á?®á?¡á??á??á??á??\ná??á??á?ªá??á??á?£á??á?? CAPTCHA á??á?? Tor-á??á? á??á?£á??á??á? á?? á??á??á??á??á?? á??á??á??á??á??á?¢á??á??á?¡ á??á?¥á??á??á??á?¡ á??á?®á??á??\ná?®á??á??á??á??á?¡."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "á??á??á??á?®á??á??á? á??á??á??á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á?? â??á??á??á?¤á??á?¡á?¢á??á?¡â?? á??á??á??á??á??á??á??á??á??á??á??á??á?ª á?¨á??á?£á?«á??á??á??á??\ná??á??á?¡á??á??á??á? á??á??á?? %sbridges@xxxxxxxxxxxxxx%s á??á?? â??get transport obfs4â?? á?¢á??á?¥á?¡á?¢á??á?¡ á??á??á? á??á??á??á??\ná?¬á??á? á??á??á??á?¡ á?¨á??á??á??á??á??á?¡á?¨á??."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "á?¡á??á??á??á??á??á? á??á??á??"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB á?£á??á? á?£á??á??á??á??á?§á??á?¤á?¡ á??á?ªá??á? á?? á??á??á??á??á??á??á??á?¡ á?®á??á??á??á??á?¡, á? á??á??á??á??á??á??á?ª á??á? á??á? á?ªá??á??á??á??á??á??\ná??á??á?¢á??á??á??á?¢á?£á? á??á??. á??á?¡á??á??á?? á??á??á??á?®á??á??á?? á?¡á??á??á??á??á??á? á??á??á??á?? á?®á??á??á??á?? á??á??á??á? á?ªá??á??á??á??á??á?¡á??á??á??á?¡\ná??á?? á??á??á??á??á?¡á??á?ªá??á??á??á?? NGO-á??á??á??á?¡á?? á??á?? á?¡á?®á??á?? á??á??á?¬á??á?¡á??á??á?£á??á??á??á??á??á??á?¡ á??á?? á??á??á? á??á??á??á?¡á??á??á??á?¡, á? á??á??á??á??á??á??á?ª\ná?®á??á??á??á??á?¡ á?¡á??á?á??á? á??á??á??á??á??. á?®á??á??á??á??á?? á? á??á??á??á??á??á??á?ª á??á? á?ªá??á??á??á??á??á?? â??á?¡á??á??á??á??á??á? á??á??á??á??â??, á?¨á??á?¡á??á?«á??á??á?? á??á? \ná?©á??á??á??á??á?¡ á??á??á??á?®á??á??á? á??á??á??á??á??á??á?¡á??á??á??á?¡. á?¨á??á??á??á?¨á??á??á??: â??á?¡á??á??á??á??á??á? á??á??á??â?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á?¡ \ná??á?¬á??á??á??á??á?? â??Unallocatedâ?? %sá??á??á?¡
á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á? á??á??á??á?¡%s á?¤á??á??á??á??á??á?¨á??."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "á??á? á??"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "á?®á??á??á??á??á??, á? á??á??á??á??á??á?? á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¡á??á?¨á?£á??á??á??á??á??á?? â??Noneâ??, á??á? á??á??á??á?ªá??á??á?? BridgeDB-á??á??.\ná??á??á??á??á?? á?®á??á??á??á?¡ á??á?¤á??á??á??á??á??á??á??á??á?¡ á??á??á?¡á?£á?®á??á?¡á??á??á??á??á??á??á??á??á??, á??á??á??á?? á??á??á??á?®á??á??á? á??á??á??á??á??á??á?¡á??á??á??á?¡\ná??á??á?¬á??á??á??á??á??. á?¨á??á??á??á?¨á??á??á??: á??á??á??á??á??á?ªá??á??á??á?? á?«á??á??á??á??á?¡á??á?¡, á??á?®á??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á? á?ªá??á??á??á??á??á?¡\ná?¡á??á?¨á?£á??á??á??á??á??á?? á??á?¦á??á??á?¨á??á?£á??á??á?? â??Noneâ??, á??á??á??á?®á??á??á??á??á??á?? á??á? á??á?? á??á?¦á??. á??á??á?®á??á??á??, á??á??á??á??á??á??á??á??á??,\ná?¡á??á??á??á?? á?¨á??á??á?ªá??á??á??á??á?? á??á?? á??á??á??á??á??á??á??á??á?? á?®á??á??á??á?¡ á??á??á??á? á?ªá??á??á??á??á??á?¡ á?¨á??á?¡á??á??á??á??á??á?¡á?? á?¡á??á?¨á?£á??á??á??á??á??.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "á??á??á?®á??á??á??, á??á??á?£á??á??á??á??á?? á??á??á??á??á?ªá??á??á??á?¡ á?¡á??á?®á??:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? IPv6-á??á??á?¡á??á??á??á? á??á??á??á???"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "á??á??á?¡á??á?á??á? á??á??á??á??á?? %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "á??á?¥á??á??á??á?? á??á? á??á?£á??á??á? á?? á??á? á??á?©á??á??á??á??á??á?¡ á?¡á?£á? á??á??á??á??á?¡ á??á??á??á??á? á??á?£á??á??á??."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "á?¨á??á??á?§á??á??á??á??á?? á?¡á??á??á??á??á??á??á??á??á?? á??á??á??á??á?? á??á? á?¡á??á??á?£á??á?? á?¡á?£á? á??á??á??á??á??á??..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "á? á??á??á??á? á?£á??á??á?? á??á??á??á??á??á??á?§á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á?¡á??á??á??á? á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á?¨á?? á?¨á??á?¡á??á?§á??á??á??á??á??, á??á??á??á??á??á??á??á? á??á??á??á??á?? á??á??á??á??á??á??á?? %sTor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡\ná??á??á??á? á??á??á?? %s á??á?? á?¨á??á??á??á??á?? á??á??á?§á??á??á??á?? á??á?¥ á??á??á?ªá??á??á?£á?? á??á??á??á??á??á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á??á?¡ á?©á??á??á??á?¢á??á??á? á??á??á??á?¡á?? á??á??\ná??á??á?¨á??á??á??á??á?¡ á??á??á??á??á??á??á??."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " á??á??á? á??á??á?? á? á??á??á?¨á??, á?¡á??á?á??á? á??á?? %sá??á??á??á??á??á?¬á??á? á??á?? Tor-á??á? á??á?£á??á??á? á??%s. Tor-á??á? á??á?£á??á??á? á??á?¡ á??á??á??á?®á??á??á? á??á??á??á??á?¡\n á?¡á??á?®á??á??á??á?«á?¦á??á??á??á??á??á??á?¨á?? á??á?®á??á??á??á??á??, á? á??á??á??á? á?£á??á??á?? á??á??á??á??á??á?¢á??á?? á?®á??á??á?? Tor-á??á? á??á?£á??á??á? á?¡. á??á?£\n á??á??á?§á??á??á??á??á?? Windows, Linux, á??á?? OS X, %sá??á??á?¬á??á??á??á??á?? á??á?¥%s á??á? á?ªá??á??á?? á?¡á??á??á??á?®á??á??á??á??. á??á?£ \n á??á??á?¥á??á?? Android, %sá??á??á?¬á??á??á??á??á?? á??á?¥%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "á? á??á??á??á?¡á??á?ª â??Tor-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á?¤á??á??á?¯á??á? á?? á??á??á??á??á?©á??á??á??á??á??, á??á??á??á?¬á??á??á??á??á?? â??á??á??á??á??á? á??á??á??á?¡â?? á??á?? á??á??á?°á?§á??á??á??á??\ná??á??á??á??á?£á? á?¡ á?¨á??á??á??á??á?? á?¨á??á??á??á??á?®á??á??á??á??á??:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "á??á?? á?®á??á??á??á??á??á?¡ Tor-á??á? á??á?£á??á??á? á?¨á?? á??á??á?¡á??á??á??á?¢á??á??á??á??á?? á??á??á?®á?¡á??á??á??á?? á??á??á? á??á??á??á?¢á? á??á??á??\ná??á??á?¬á??á??á??á??á?? â??Torâ?? á??á?? á?¨á??á??á??á??á?? á??á?? á??á??á??á??á??á?¢á??á?? â??á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á?¡\ná??á??á??á??á??á??á??á??á?¡â?? á??á??á??á??á??."
-#. 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 "á??á?¥á??á??á??á?? á??á??á?¢á??á? á??á??á?¢-á??á??á??á?¡á??á?®á?£á? á??á??á??á?¡ á??á??á??á?¬á??á??á??á??á??á??á?? (ISP) á??á? á?«á??á??á??á??á?¡ á??á?? á? á??á??á??á??á??á??á? á??á??\ná??á?¦á?£á??á??á??á?¡ Tor-á?¥á?¡á??á??á??á??á?? á??á??á??á?¨á??á? á?¡?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(á??á??á??á?®á??á??á??á?? á?¨á??á?£á??á??á?¦á??á??á??á?? Tor-á?®á??á??á??á??á??á?¡.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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-á?¥á?¡á??á??á??á?¡ á??á??á? á??á??á??á?¢á? á??á??á??á?¡â?? á??á??á??á??á?£á? á?¨á??, á??á??á??á??á?¢á??á??á??á??á?? á??á?®á??á? á??á??á?á??á? á??á?¡ á??á??á?¡á??á?¦á??á??á??á??."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "á?©á??á??á?£á??á??á??á? á??á??á?? á??á??á??á??á??á?ªá??á??á?? á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6-á??á??á?¡á??á??á??á? á??á??á?¡ á?®á??á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "á??á??á?¡á??á??á? á??á??á??á??á??á?? TYPE-á??á??á??á??á??á?§á??á??á??á??á?¡ á??á??á??á?®á??á??á??á??."
+msgid "(Request IPv6 bridges.)"
+msgstr "(á??á??á??á?®á??á??á??á?? IPv6-á?®á??á??á??á??á??á?¡.)"
-#. 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 "BridgeDB-á?¡ á?¡á??á??á?¯á??á? á?? GnuPG-á??á??á?¡á??á?¦á??á??á??á?¡ á??á??á?¦á??á??á??."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(á??á??á??á?®á??á??á??á?? á?¨á??á??á??á?¦á??á?£á??á?? obfs4-á?®á??á??á??á??á??á?¡.)"
diff --git a/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po
index f9ddedf..b861bbd 100644
--- a/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/kk/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,140 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>, 2019
+# Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>, 2019-2020
# Gabit Aidarbek <agabit@xxxxxxxxx>, 2014
# Nurlan Rakhimzhanov <nurlan.rakhimzhanov@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-02-20 18:32+0000\n"
-"Last-Translator: Dinmuhamed Esengeldi <esengeldi0202@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: kk\n"
"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?еÑ?Ñ?Ñ?Ñ?Ò£Ñ?з, Ñ?Ñ?здÑ?Ò£ Ñ?Ò±Ñ?анÑ?Ñ?Ñ?Ò£Ñ?з бойÑ?нÑ?а белгÑ?Ñ?Ñ?з Ò?иÑ?нÑ?Ñ?лÑ?Ò?Ñ?аÑ? баÑ?. "
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "ТÑ?л"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ò?аÑ?е Ñ?Ñ?Ñ?алÑ? Ñ?абаÑ?лаÑ?"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?аÑ?Ñ?апÒ?Ñ? кодÑ?"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "ӨзгеÑ?Ñ?Ñ?Ñ?еÑ? жÑ?Ñ?налÑ?"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?айланÑ?Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ð?аÑ?лÑ?Ò?Ñ?н Ñ?аңдаңÑ?з"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR кодÑ?Ñ? көÑ?Ñ?еÑ?Ñ?"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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 "УÑ?Ñ?,Ñ?пагеÑ?Ñ?и!\nÐ?аÑ?гон Ñ?өз."
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "СÑ?здÑ?Ò£ QR кодÑ?Ñ? алÒ?ан кезде Ò?аÑ?елÑ?к болÒ?ан Ñ?иÑ?Ò?Ñ?Ñ?."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ð?нда Ò?азÑ?Ñ?гÑ? кезде көпÑ?Ñ?леÑ? жоÒ? ..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Ò?адам %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser %s жүкÑ?еÑ?"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Ò?адам %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s көпÑ?Ñ?леÑ?дÑ? %s алÑ?"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Ò?адам %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Ð?ндÑ? %s Tor Brouser-ге көпÑ?Ñ?леÑ?дÑ? Ò?оÑ?Ñ? %s"
@@ -128,27 +143,27 @@ msgstr "Ð?ндÑ? %s Tor Brouser-ге көпÑ?Ñ?леÑ?дÑ? Ò?оÑ?Ñ? %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sJ%sust көпÑ?Ñ?леÑ?дÑ? маÒ?ан беÑ?Ñ?Ò£Ñ?з! "
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "ТолÑ?Ò? паÑ?амеÑ?Ñ?леÑ?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ð?оÒ?"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "Ð?оÒ?"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses! "
@@ -156,69 +171,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%set Ð?өпÑ?Ñ? "
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?ұл авÑ?омаÑ?Ñ?Ñ? Ñ?Ò¯Ñ?дегÑ? Ñ?аÑ?, бұÒ?ан жаÑ?ап беÑ?меÑ?Ñ?Ò£Ñ?здÑ? Ñ?Ò±Ñ?аймÑ?з.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ð?Ñ?нда Ñ?Ñ?здÑ?Ò£ көпÑ?Ñ?леÑ?Ñ?Ò£Ñ?з:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 Ñ?аманÑ? Ò?Ò±Ñ?айдÑ?. Сол Ñ?аÒ?Ñ?Ñ? аÑ?алÑ?Ò?Ñ?ндаÒ?Ñ? Ñ?аÑ?Ñ?аÑ?дÑ?Ò£ баÑ?лÑ?Ò?Ñ? еленбейдÑ?. "
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: бÑ?Ñ?неÑ?е ваÑ?ианÑ?Ñ?аÑ?дÑ? Ò?аÑ?аÑ? Ñ?аңдаÑ? Ò¯Ñ?Ñ?н коммандалаÑ?дÑ? бÑ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ?, "
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB-ге Ò?оÑ? келдÑ?Ò£Ñ?з!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ò?азÑ?Ñ?гÑ? кезде Ò?олдаÑ?да келеÑ?Ñ? TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ó?й, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "СÓ?лем, доÑ?Ñ?м!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð?ұл Ñ?лекÑ?Ñ?ондÑ? поÑ?Ñ?а жаңбÑ?Ñ?, жалаңаÑ?Ñ?анÒ?ан жÓ?не жаÑ?Ò?Ñ?Ñ?аÒ?андаÑ?мен жаÑ?алдÑ?\nаÑ?налÒ?ан %sat%s at%s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,7 @@ msgid ""
msgstr "BridgeDB Pluggable Transports бÑ?Ñ?неÑ?е %sÑ?Ò¯Ñ?Ñ?мен көпÑ?Ñ?леÑ?дÑ? Ò?амÑ?амаÑ?Ñ?з еÑ?едÑ?%s,\nбұл Tor Networ Ò?оÑ?Ñ?лÑ?лаÑ?Ñ?Ò£Ñ?зÒ?а кедеÑ?гÑ? келÑ?Ñ?Ñ?е аладÑ?, мұнÑ? көбÑ?Ñ?ек еÑ?едÑ?\nСÑ?з өзÑ?Ò£Ñ?здÑ?Ò£ инÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?икÑ?Ò£Ñ?здÑ? Ò?адаÒ?алап оÑ?Ñ?Ñ?Ò?анÑ?Ò£Ñ?здÑ? анÑ?Ò?Ñ?аÑ? Ò¯Ñ?Ñ?н Ò?иÑ?н\nTor пайдаланÑ?.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ msgid ""
"\n"
msgstr "СонÑ?мен Ò?аÑ?аÑ?, BridgeDB-де көпÑ?еген plain-ol'-vanilla көпÑ?Ñ?леÑ?Ñ?%s Pluggable Transports %sолаÑ? мүмкÑ?н күÑ?Ñ?Ñ? емеÑ?, бÑ?Ñ?аÒ? олаÑ? \nкөпÑ?еген жаÒ?дайлаÑ?да инÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?анÑ? айналÑ?п Ó©Ñ?Ñ?ге көмекÑ?еÑ?едÑ?.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ð?өпÑ?Ñ?леÑ? дегенÑ?мÑ?з не?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%sÐ?өпÑ?Ñ?леÑ? %s Tor Ñ?елеÑ?Ñ?, Ñ?ензÑ?Ñ?анÑ? айналÑ?п Ó©Ñ?Ñ?ге көмекÑ?еÑ?едÑ?."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?өпÑ?Ñ?леÑ? алÑ?дÑ?Ò£ маÒ?ан баÑ?Ò?а жолÑ? кеÑ?ек!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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.Ð?азаÑ? аÑ?даÑ?Ñ?Ò£Ñ?з, Ñ?Ñ?зге кеÑ?ек\nÑ?лекÑ?Ñ?ондÑ?Ò? поÑ?Ñ?анÑ? Ñ?өмендегÑ? Ñ?лекÑ?Ñ?ондÑ?Ò? поÑ?Ñ?а пÑ?овайдеÑ?леÑ?Ñ?нÑ?Ò£ бÑ?Ñ?Ñ?нÑ?Ò£ мекенжайÑ?нан жÑ?беÑ?Ñ?Ò£Ñ?з:%s,%s немеÑ?е%s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ð?өпÑ?Ñ?леÑ?дÑ? алÑ?дÑ?Ò£ Ñ?аÒ?Ñ? бÑ?Ñ? Ñ?Ó?Ñ?Ñ?лÑ? - Ñ?лекÑ?Ñ?ондÑ?Ò? поÑ?Ñ?анÑ? жÑ?беÑ?Ñ?%s.ÐлекÑ?Ñ?ондÑ?Ò? поÑ?Ñ?анÑ?Ò£ Ñ?аÒ?Ñ?Ñ?Ñ?бÑ?н боÑ? Ò?алÑ?дÑ?Ñ?Ñ?Ò£Ñ?з жÓ?не Ñ?лекÑ?оÑ?ндÑ?Ò? поÑ?Ñ?а Ñ?абаÑ?ламаÑ?Ñ?нÑ?Ò£ негÑ?згÑ? мÓ?Ñ?Ñ?нÑ?не \"get transport obfs4\" деп жазÑ?Ò£Ñ?з.ÐлекÑ?Ñ?ондÑ?Ò? поÑ?Ñ?анÑ? келеÑ?Ñ? Ñ?лекÑ?Ñ?ондÑ?Ò? поÑ?Ñ?а жеÑ?кÑ?зÑ?Ñ?Ñ?леÑ?Ñ?нÑ?Ò£ бÑ?Ñ?Ñ?нÑ?Ò£ мекен-жайÑ? аÑ?Ò?Ñ?лÑ? жÑ?беÑ?Ñ?Ñ?Ò£Ñ?з кеÑ?ек:%sнемеÑ?е%s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ð?енÑ?Ò£ көпÑ?Ñ?леÑ?Ñ?м жұмÑ?Ñ? Ñ?Ñ?Ñ?емейдÑ?! Ð?өмек Ò?ажеÑ?!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?геÑ? Ñ?Ñ?здÑ?Ò£ Tor желÑ?Ò£Ñ?з Ñ?Ñ?Ñ?емеÑ?е,мÑ?на email-Ò?а жазÑ?Ò£Ñ?з %s. "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ӨзÑ?Ò£Ñ?здÑ?Ò£ Ñ?Ñ?Ñ?Ò£Ñ?з Ñ?Ñ?Ñ?алÑ?, Ñ?онÑ?Ò£ Ñ?Ñ?Ñ?нде, Ñ?Ñ?зÑ?мÑ?н Ò?оÑ?Ñ?п көÑ?Ñ?Ò£Ñ?з\nкөпÑ?Ñ?леÑ?дÑ? жÓ?не Pluggable Transports-Ñ?Ñ? пайдаланÒ?Ñ?Ò£Ñ?з келген, Tor Browser нұÑ?Ò?аÑ?Ñ?н,\nжÓ?не Tor беÑ?ген баÑ?лÑ?Ò? Ñ?абаÑ?лаÑ? жÓ?не Ñ?.б."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ð?геÑ? Ñ?Ñ?здÑ?Ò£ Tor Browser-Ñ?Ò£Ñ?з Ò?оÑ?Ñ?ла алмаÑ?а,бÑ?збен %sÑ?анÑ?Ñ?Ñ?Ñ?Ò£Ñ?здÑ?%s Ó©Ñ?Ñ?немÑ?з."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ð?Ñ?не Ñ?Ñ?здÑ?Ò£ көпÑ?Ñ? желÑ?леÑ?Ñ?Ò£Ñ?з:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ð?өпÑ?Ñ?леÑ?дÑ? алÑ?Ò£Ñ?з!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ð?өпÑ?Ñ?леÑ?дÑ? Ñ?аÑ?аÑ?Ñ? меÑ?анизмдеÑ?Ñ?."
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB көпÑ?Ñ?леÑ?дÑ? Ñ?аÑ?аÑ?Ñ?дÑ?Ò£ Ñ?Ó©Ñ?Ñ? меÑ?анизÑ?мÑ?н Ò?олданадÑ?: \"HTTPS\", \"Moat\", \"Email\" жÓ?не \"Reserved\". BridgeDB аÑ?Ò?Ñ?лÑ? Ñ?аÑ?аÑ?Ñ?лмаÒ?ан көпÑ?Ñ?леÑ?де «Ð?оÒ?» жалÒ?ан меÑ?анизм Ò?олданÑ?ладÑ?.ТөмендегÑ? Ñ?Ñ?зÑ?м мұнÑ?Ò£ Ò?алай жұмÑ?Ñ? Ñ?Ñ?Ñ?ейÑ?Ñ?нÑ?н Ñ?Ò¯Ñ?Ñ?ндÑ?Ñ?едÑ? жÓ?не бÑ?здÑ?Ò£ %sBridgeDB өлÑ?емдеÑ?Ñ?мÑ?з%s Ó?Ñ?Ò?айÑ?Ñ?Ñ?Ñ?нÑ?Ò£ Ò?анÑ?алÑ?Ò?Ñ?Ñ? Ñ?анÑ?мал екенÑ?н көÑ?Ñ?еÑ?едÑ?."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "«HTTPS» Ñ?аÑ?аÑ?Ñ? меÑ?анизмÑ? оÑ?Ñ? веб-Ñ?айÑ? аÑ?Ò?Ñ?лÑ? көпÑ?Ñ?леÑ? Ñ?аÑ?аÑ?адÑ?.Ð?өпÑ?Ñ?леÑ?дÑ? алÑ? Ò¯Ñ?Ñ?н, %sbridges.torproject.org%s Ñ?айÑ?Ñ?на Ó©Ñ?Ñ?п, өзÑ?Ò£Ñ?з Ò?алаÒ?ан паÑ?амеÑ?Ñ?леÑ?дÑ? Ñ?аңдаңÑ?з жÓ?не\nкелеÑ?Ñ? CAPTCHA-нÑ? Ñ?еÑ?Ñ?Ò£Ñ?з."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "\"Moat\" Ñ?аÑ?аÑ?Ñ? меÑ?анизмÑ? TorBrowser-дÑ?Ò£ бөлÑ?гÑ?, пайдаланÑ?Ñ?Ñ?лаÑ?Ò?а Tor Browser паÑ?амеÑ?Ñ?леÑ?Ñ?нÑ?Ò£ Ñ?Ñ?Ñ?нен көпÑ?Ñ? Ñ?Ò±Ñ?аÑ?Ò?а мүмкÑ?ндÑ?к беÑ?едÑ?.Ð?өпÑ?Ñ?дÑ? алÑ? Ò¯Ñ?Ñ?н, Ñ?Ñ?здÑ?Ò£ Tor Browser-Ñ?Ò£Ñ?здегÑ? %sTor паÑ?амеÑ?Ñ?леÑ?Ñ?не%s кÑ?Ñ?Ñ?Ò£Ñ?з, \"жаңа көпÑ?Ñ? Ñ?Ò±Ñ?аÑ?\" баÑ?Ñ?Ñ?маÑ?Ñ?н баÑ?Ñ?Ò£Ñ?з,келеÑ?Ñ? CAPTCHA-нÑ? Ñ?еÑ?Ñ?Ò£Ñ?з, жÓ?не Tor Browser авÑ?омаÑ?Ñ?Ñ? Ñ?Ò¯Ñ?де жаңа көпÑ?Ñ?леÑ?дÑ? Ò?оÑ?адÑ?"
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "\"Email\" Ñ?аÑ?аÑ?Ñ? меÑ?анизÑ?мÑ?н Ò?олданаÑ?Ñ?н пайдаланÑ?Ñ?Ñ?лаÑ? %sbridges@xxxxxxxxxxxxxx%s мекен жайÑ?на Ñ?лекÑ?Ñ?ондÑ?Ò? поÑ?Ñ?анÑ? жÑ?беÑ?Ñ? аÑ?Ò?Ñ?лÑ? жаңа көпÑ?Ñ? Ñ?Ò±Ñ?ай аладÑ? жÓ?не Ñ?абаÑ?алма мÓ?Ñ?Ñ?нÑ?не \"get transport obfs4\" жазÑ?Ò£Ñ?з."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "СаÒ?Ñ?алÒ?ан"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB авÑ?омаÑ?Ñ?Ñ? Ñ?Ò¯Ñ?де Ñ?аÑ?аÑ?Ñ?лмайÑ?Ñ?н көпÑ?Ñ?леÑ?дÑ?Ò£ аз бөлÑ?гÑ?н Ò±Ñ?Ñ?айдÑ?.Ð?нÑ?Ò£ оÑ?нÑ?на бÑ?з бұл көпÑ?Ñ?леÑ?дÑ? Ò?олмен Ñ?аÑ?аÑ?Ñ? Ò¯Ñ?Ñ?н Ñ?езеÑ?вÑ?е Ñ?аÒ?Ñ?ап, олаÑ?дÑ? көпÑ?Ñ?ге мұÒ?Ñ?аж үкÑ?меÑ?Ñ?к емеÑ? ұйÑ?мдаÑ?Ò?а жÓ?не баÑ?Ò?а ұйÑ?мдаÑ? мен жеке адамдаÑ?Ò?а Ñ?абÑ?Ñ?Ñ?аймÑ?з.\"Reserved\" меÑ?анизмÑ? аÑ?Ò?Ñ?лÑ? Ñ?аÑ?аÑ?Ñ?лаÑ?Ñ?н көпÑ?Ñ?леÑ? пайдаланÑ?Ñ?Ñ?лаÑ?дÑ? ұзаÒ? Ñ?аÒ?Ñ?Ñ? көÑ?е алмаÑ?Ñ? мүмкÑ?н.\"Reserved\" Ñ?аÑ?аÑ?Ñ? меÑ?анизмÑ? %sкөпÑ?Ñ? пÑ?лÑ?н Ñ?аÒ?айÑ?ндаÑ?%s Ñ?айлдаÑ?Ñ?нда \"Unallocated\" деп аÑ?алаÑ?Ñ?нÑ?н еÑ?кеÑ?Ñ?Ò£Ñ?з."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?Ñ?Ò?айÑ?Ñ?Ñ?Ñ? жоÒ?"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "ТаÑ?аÑ?Ñ? меÑ?анизмÑ? \"None\" болÑ?п Ñ?абÑ?лаÑ?Ñ?н көпÑ?Ñ? BridgeDB Ñ?аÑ?аÑ?пайдÑ?.Ð?өпÑ?Ñ?леÑ?дÑ? пайдаланÑ?Ñ?Ñ?лаÑ?Ò?а Ñ?аÑ?аÑ?Ñ? көпÑ?Ñ? опеÑ?аÑ?оÑ?Ñ?на жүкÑ?еледÑ?.ÐÑ?Ñ?еÑ?еÑ?алÑ?Ò? Ñ?здеÑ?де жаңадан Ò?Ò±Ñ?Ñ?лÒ?ан көпÑ?Ñ?дÑ? Ñ?аÑ?аÑ?Ñ? меÑ?анизмÑ? Ñ?аммамен бÑ?Ñ? күнге дейÑ?н \"None\" дейдÑ?.Ð?здап Ñ?Ñ?дамадÑ? болÑ?Ò£Ñ?з, Ñ?одан кейÑ?н ол көпÑ?Ñ?дÑ?Ò£ наÒ?Ñ?Ñ? Ñ?аÑ?аÑ?Ñ? меÑ?анизмÑ?не аÑ?Ñ?Ñ?адÑ?.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ð?өпÑ?Ñ? Ñ?Ò¯Ñ?Ñ?нÑ?Ò£ паÑ?амеÑ?Ñ?леÑ?Ñ?н Ñ?аңдаңÑ?з:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "СÑ?зге IPv6 мекенжайлаÑ?Ñ? кеÑ?ек пе?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "%s Ñ?Ñ?зге Ò?ажеÑ?пе?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "СÑ?здÑ?Ò£ бÑ?аÑ?зеÑ?Ñ?Ò£Ñ?з дұÑ?Ñ?Ñ? бейненÑ? көÑ?Ñ?еÑ?пейдÑ?."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Ð?оÒ?аÑ?Ñ?даÒ?Ñ? Ñ?Ñ?Ñ?еÑ?Ñ?егÑ? Ñ?аңбалаÑ?дÑ? енгÑ?зÑ?Ò£Ñ?з ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "СÑ?здÑ?Ò£ көпÑ?Ñ?леÑ?Ñ?Ò£Ñ?здÑ? Ò?алай пайдаланÑ?Ò?а боладÑ?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Tor Browser-ге көпÑ?Ñ?леÑ?дÑ? енгÑ?зÑ? Ò¯Ñ?Ñ?н, бÑ?Ñ?Ñ?нÑ?Ñ? оÑ?Ñ? жеÑ?ден %sTor Browser-дÑ? баÑ?Ñ?Ò£Ñ?з\n %sжÓ?не оÑ?Ñ? жеÑ?ден нұÑ?Ò?аÑ?лÑ?Ò?Ñ?Ñ? оÒ?Ñ?п Tor Browser-дÑ? баÑ?Ñ?Ò£Ñ?з жÓ?не Ð?Ð?СТÐ?ҢЫÐ?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Ð?Ñ?Ñ?Ñ?нÑ?Ñ?, Ñ?Ñ?з %s Tor Browser-дÑ? жүкÑ?еÑ?Ñ?Ò£Ñ?з Ò?ажеÑ?%s.Ð?Ñ?здÑ?Ò£ Tor Browser-дÑ? Ò?олданÑ?Ñ?Ñ?лаÑ?Ò?а аÑ?налÒ?ан Ð?Ò±Ñ?Ò?аÑ?лÑ?Ò?Ñ?мÑ?зда Tor Browser-ге Ñ?Ñ?здÑ?Ò£ көпÑ?Ñ?Ñ?Ò£Ñ?здÑ?Ò£ Ò?алай Ò?оÑ?Ñ? кеÑ?ек екендÑ?гÑ? Ñ?Ò¯Ñ?Ñ?ндÑ?Ñ?Ñ?лген.Ð?геÑ? Ñ?Ñ?з Windows, Linux, немеÑ?е OS X Ò?олданÑ?аңÑ?з %sмÑ?нанÑ? баÑ?Ñ?Ò£Ñ?з%s.Ð?геÑ? Ñ?Ñ?з Android-Ñ?Ñ? Ò?олданÑ?аңÑ?з %sмÑ?на жеÑ?дÑ? баÑ?Ñ?Ò£Ñ?з%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "'Tor Network Settings' диалогÑ? Ñ?Ñ?Ò?Ò?ан кезде 'Ð?онÑ?игÑ?Ñ?аÑ?иÑ?' пÓ?Ñ?менÑ?н Ñ?аңдап, онÑ? оÑ?Ñ?ндаңÑ?з\nÑ?ебеÑ? Ñ?Ò±Ñ?аÒ?анÑ?а:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "СÑ?здÑ?Ò£ инÑ?еÑ?неÑ?Ñ?егÑ? Ò?Ñ?змеÑ? көÑ?Ñ?еÑ?Ñ? пÑ?овайдеÑ?Ñ?Ò£Ñ?з(ISP) Ñ?ензÑ?Ñ?аÒ?а байланÑ?Ñ?Ñ?Ñ? \"Tor\" желÑ?Ñ?Ñ?н бұÒ?аÑ?Ñ?айма?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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 Network Settings» баÑ?Ñ?Ñ?маÑ?Ñ?н баÑ?Ñ?Ò£Ñ?з"
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?анилÑ?дÑ? көпÑ?Ñ?леÑ?дÑ? Ñ?Ò±Ñ?аÑ?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 көпÑ?Ñ?леÑ?Ñ?н Ñ?Ò±Ñ?аÑ?."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE бойÑ?нÑ?а бÑ?Ñ?Ñ?кÑ?Ñ?Ñ?Ñ?лген Ñ?аÑ?Ñ?малдÑ? Ñ?Ò±Ñ?аңÑ?з."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "BridgeDB Ò?оÒ?амдÑ?Ò? GnuPG кÑ?лÑ?Ñ?нÑ?Ò£ көÑ?Ñ?Ñ?меÑ?Ñ?н алÑ?Ò£Ñ?з."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po
index 261d478..9ae5b1f 100644
--- a/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/km/LC_MESSAGES/bridgedb.po
@@ -1,100 +1,209 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2014 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
+# Dany Sum <danysum696@xxxxxxxxx>, 2018
# Seng Sutha <sutha@xxxxxxxxxxx>, 2014
# Sokhem Khoem <sokhem@xxxxxxxxxxx>, 2014
# Sok Sophea <sksophea@xxxxxxxxx>, 2014
# Sok Sophea <sksophea@xxxxxxxxx>, 2013
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
+"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywords=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n"
-"POT-Creation-Date: 2014-07-26 02:11+0000\n"
-"PO-Revision-Date: 2014-10-15 17:11+0000\n"
-"Last-Translator: Sokhem Khoem <sokhem@xxxxxxxxxxx>\n"
-"Language-Team: Khmer (http://www.transifex.com/projects/p/torproject/language/km/)\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 2.8.0\n"
"Language: km\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: lib/bridgedb/HTTPServer.py:121
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "á??á?¼á??á??á??á??! á?¢á??á??á?¸â??á??á?½á??â??á??á?¶á??â??á??á??á? á?»á??â??á??á?¶á??á?½á??â??á??á??á??á?¾â??á??á??á??á??â??á?¢á??á??á??á??"
-#: lib/bridgedb/strings.py:18
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[á??á??á??â??á??á?¶â??á??á?¶á??â??á??á??á??á??á??á??á??á??á??á??á??á??á?·; á??á?¼á??â??á??á?»á??â??á??á??á??á?¾á??á??á??á??]"
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "á??á?¶á??á?¶"
-#: lib/bridgedb/strings.py:20
-msgid "Here are your bridges:"
-msgstr "á??á??á??â??á??á?¶â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
-#: lib/bridgedb/strings.py:22
-#, python-format
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "á??á?¼á??â??á??á??á??á??á??"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Changelog"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "á??á??á??á?¾á??á??á?¾á??á??á?¶á??á??á?¢á??á??"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "á??á??á??á? á?¶á?? QRá??á?¼á??"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
-"You have exceeded the rate 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."
+"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/strings.py:25
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?½á??â??á?¡á?¾á??..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr " á??á??á??á? á??á??â??á??á?¶â??á?¢á??á??á??â??á??á?½á??á??á??â??á??á??á??á?¶á??á?¶á?? %s á??á??á??á?¡á??á??â??á??á??â??á??á?¶á??á?? %s á? á?¾á??â??á??á??á??á?¾á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??á??!"
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: lib/bridgedb/strings.py:28
-msgid "Welcome to BridgeDB!"
-msgstr "á??á??á??á?¶á??á??á??á??â??á??á??á??á?¶á??á?? BridgeDB!"
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "á??á??á? á?¶á?? %s1%s"
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: lib/bridgedb/strings.py:30
-msgid "Currently supported transport TYPEs:"
-msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á??â??á??á??á??á??á??â??á??á?¶á??â??á??á?¶á??á??á??á?? TYPEs á??"
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "á??á?¶á??â??á??á?? %s Tor Browser %s"
-#: lib/bridgedb/strings.py:31
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
-msgid "Hey, %s!"
-msgstr "á? á??, %s!"
+msgid "Step %s2%s"
+msgstr "á??á??á? á?¶á?? %s2%s"
-#: lib/bridgedb/strings.py:32
-msgid "Hello, friend!"
-msgstr "á??á?½á??á??á??á?¸, á??á?·á??á??á??á??á??á??á??á??á?·!"
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "á??á?? %s á??á??á??á??á?¸á??á??á?? %s"
-#: lib/bridgedb/strings.py:33 lib/bridgedb/templates/base.html:101
-msgid "Public Keys"
-msgstr "á??á??â??á??á?¶á??á?¶á??á??á??"
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "á??á??á? á?¶á?? %s3%s"
-#. 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/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, 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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sJ%sust á??á??á??á??á??â??á?²á??á??â??á??á??á??á?»á??â??á??á?¼á??â??á??á??á??á??á?¸á??á??á??!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "á??á??á??á??á?¾á??â??á??á??á??á??á?·á??â??á??á??á??á??á??"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "á??á??"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "á??á??á??á?¶á??"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, 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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%set á??á??á??á??á?¸á??á??á??"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "á??á??á??â??á??á?¶â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
+
+#: bridgedb/strings.py:37
#, python-format
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "á?¢á??á?¸á??á??á??â??á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á??á??á??á??á?¾á??â??á?¡á?¾á??â??â??á??á?¶á??á?½á?? rainbows, unicorns, á??á?·á?? sparkles\ná??á??á??á??á?¶á??á?? %s á??á?¾ %s á??á?? %s á??"
+"You have exceeded the rate 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."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -105,7 +214,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:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -117,7 +226,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:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -126,235 +235,169 @@ 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:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "á??á?¾â??á??á??á??á??á?¸á??á??á??â??â??á??á?¶â??á?¢á??á??á?¸?"
-#: lib/bridgedb/strings.py:77
+#: bridgedb/strings.py:79
#, 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:84
msgid "I need an alternative way of getting bridges!"
msgstr "á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á?·á??á?¸á??á?¶á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á?¶â??á??á??â??á??á?¶á??â??á??á??á?½á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??!"
-#: lib/bridgedb/strings.py:83
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "á??á?·á??á?¸á??á?½á??â??á??á??á??â??á??á?¾á??á??á??á?¸á??á??á?½á?? bridges á??á?ºâ??á??á??á??á?¼á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á?? %s á?? á??á?¼á??â??á??á??á??á?¶á??â??á??á?¶ á?¢á??á??á??á??á??á??á?¼á??â??á??á??â??á??á??á??á?¾â??á?¢á??á?¸á??á??á??â??á??á??á??â??á??á??á??á?¾á?¢á?¶á??á??á??á??á??á?¶á??â??á??á?¸â??á??á??á??á?»á??á? á??á?»á??â??á??á??á??á??á??á?¢á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?»á??â??á??á??á??á??á??â??á??á??á??á?»á??á? á??á?»á??â??á??á?¶á??â??á??á??á??á??á??á??\n%s, %s á?¬ %s á??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: lib/bridgedb/strings.py:90
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "á??á??á??á??á?¸á??á??á??â??â??á??á??á??á??â??á??á??á??á?»á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??! á??á??á??á?»á??â??á??á??á??á?¼á??á??á?¶á??â??á??á??á??á?½á??!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:92
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "á??á??á??á??á?·á??á??á?¾ Tor á??á??á??á??â??á?¢á??á??á??â??á??á?·á??â??á??á??á??á?¾á??á??á?¶á??, á?¢á??á??á??â??á??á?½á??á??á??â??á?¢á??á?¸á??á??á?? %s á??"
-
-#. 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
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: lib/bridgedb/strings.py:103
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "á??á??á??â??á??á?¶â??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
-#: lib/bridgedb/strings.py:104
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "á??á??á?½á??â??á??á??â??á??á??á??á??á?¸á??á??á??!"
-#: lib/bridgedb/strings.py:108
-msgid "Please select options for bridge type:"
-msgstr "á??á?¼á??â??á??á??á??á?¾á??â??á??á??á??á??á?¾á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??á??"
-
-#: lib/bridgedb/strings.py:109
-msgid "Do you need IPv6 addresses?"
-msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á?¶á??á??á??á??á??á?¶á?? IPv6 á?¬?"
-
-#: lib/bridgedb/strings.py:110
-#, python-format
-msgid "Do you need a %s?"
-msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á?? %s?"
-
-#: lib/bridgedb/strings.py:114
-msgid "Your browser is not displaying images properly."
-msgstr "á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??â??á??á?·á??â??á??á??á??á?»á??â??á??á??á??á? á?¶á??â??á??á?¼á??á??á?¶á??â??á??á??á??â??á??á??á??á?¹á??á??á??á??á?¼á??â??á?¡á?¾á??á??"
-
-#: lib/bridgedb/strings.py:115
-msgid "Enter the characters from the image above..."
-msgstr "á??á??á??á??á?¼á??â??á??á?½â??á?¢á??á??á??á??â??á??á?¸â??á??á?¼á??á??á?¶á??â??á??á?¶á??á??á?¾..."
-
-#: lib/bridgedb/strings.py:119
-msgid "How to start using your bridges"
-msgstr "á??á??á??á??â??á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??"
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: lib/bridgedb/strings.py:121
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
#, python-format
msgid ""
-"To enter bridges into Tor Browser, follow the instructions on the %s Tor\n"
-"Browser download page %s to start Tor Browser."
-msgstr "á??á?¾á??á??á??á?¸â??á??á??á??á??á?¼á??â??á??á??á??á??á?¸á??á??á??â??á??á??â??á??á?¶á??á?? Tor Browser, á?¢á??á?»á??á??á??á??â??á??á??á??á??á??á??á?¸â??á??á??á??á?¶á??â??á??á??â??á??á?¾â??á??á??á??á??á??â?? %s Tor\nBrowser %s á??á?¾á??á??á??á?¸â??á??á?¶á??á??á??á??á??á?¾á?? Tor Browser á??"
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:125
+#: bridgedb/strings.py:115
+#, python-format
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "á??á??â??á??á??á??â??á??á??á??á?¢á??á??â?? 'á??á?¶á??â??á??á??á??á??á??â??á??á??á??á??á?¶á??' á??á??á??â??á?¡á?¾á??, á??á?»á?? 'á??á??á??á??á??â??á??á??á??á?¶á??á??á??á??á??á??á??á??' á??á?·á??â??á?¢á??á?»á??á??á??á??â??á?¢á??á??á??â??á??á??á??á?½á??á??á?¶á??â??á??á? á?¼á??â??á??á??á??â??á??á?¶á??á??á?·á??á??á??â??á??á??á??á??â??á?¢á??á??á??á??"
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:129
+#: bridgedb/strings.py:119
+#, python-format
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?"
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: lib/bridgedb/strings.py:133
+#: bridgedb/strings.py:125
+#, python-format
msgid ""
-"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
-"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\npaste the bridge lines into the text input box. Finally, click 'Connect', and\nyou should be good to go! If you experience trouble, try clicking the 'Help'\nbutton in the 'Tor Network Settings' wizard for further assistance."
-
-#: lib/bridgedb/strings.py:141
-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:145
-msgid "Request vanilla bridges."
-msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á?¼á??á??á??á??á?¶á??á??"
-
-#: lib/bridgedb/strings.py:146
-msgid "Request IPv6 bridges."
-msgstr "á??á??á??á?¾â??á??á??á??á??á?¸á??á??á?? IPv6 á??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: lib/bridgedb/strings.py:148
-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:151
-msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Get a copy of BridgeDB's public GnuPG key."
-
-#: lib/bridgedb/templates/base.html:92
-msgid "Report a Bug"
-msgstr "á??á??á?¶á??á??á?¶á??á??á??â??á??á??á? á?»á??"
-
-#: lib/bridgedb/templates/base.html:94
-msgid "Source Code"
-msgstr "á??á?¼á??â??á??á??á??á??á??"
-
-#: lib/bridgedb/templates/base.html:97
-msgid "Changelog"
-msgstr "Changelog"
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
-#: lib/bridgedb/templates/base.html:99
-msgid "Contact"
-msgstr "á??á??á??á?¶á??á??á??á??á??á??"
+#: bridgedb/strings.py:129
+msgid "Reserved"
+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:66
-msgid "Uh oh, spaghettios!"
-msgstr "Uh oh, spaghettios!"
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:72
-msgid "There currently aren't any bridges available..."
-msgstr "á??á??á??á??á?»á??á??á??á??á??á??â??á??á?·á??â??á??á?¶á??â??á??á??á??á??á?¸á??á??á??â??á??á?½á??â??á??á??á??á?½á??â??á?¡á?¾á??..."
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:73
-#, python-format
+#: bridgedb/strings.py:138
msgid ""
-" Perhaps you should try %s going back %s and choosing a different bridge "
-"type!"
-msgstr " á??á??á??á? á??á??â??á??á?¶â??á?¢á??á??á??â??á??á?½á??á??á??â??á??á??á??á?¶á??á?¶á?? %s á??á??á??á?¡á??á??â??á??á??â??á??á?¶á??á?? %s á? á?¾á??â??á??á??á??á?¾á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??á??!"
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
-#: lib/bridgedb/templates/index.html:11
-#, python-format
-msgid "Step %s1%s"
-msgstr "á??á??á? á?¶á?? %s1%s"
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "á??á?¼á??â??á??á??á??á?¾á??â??á??á??á??á??á?¾á??â??á??á??á??á??á?¶á??á??â??á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??á??"
-#: lib/bridgedb/templates/index.html:13
-#, python-format
-msgid "Download %s Tor Browser %s"
-msgstr "á??á?¶á??â??á??á?? %s Tor Browser %s"
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á??â??á?¢á?¶á??á??á??á??á??á?¶á?? IPv6 á?¬?"
-#: lib/bridgedb/templates/index.html:25
+#: bridgedb/strings.py:150
#, python-format
-msgid "Step %s2%s"
-msgstr "á??á??á? á?¶á?? %s2%s"
+msgid "Do you need a %s?"
+msgstr "á??á?¾â??á?¢á??á??á??â??á??á??á??á?¼á??â??á??á?¶á?? %s?"
-#: lib/bridgedb/templates/index.html:27
-#, python-format
-msgid "Get %s bridges %s"
-msgstr "á??á?? %s á??á??á??á??á?¸á??á??á?? %s"
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "á??á??á??á??á??á?·á??á?¸â??á?¢á??á?¸á??á??á?ºá??á?·á??â??á??á??á??á??â??á?¢á??á??á??â??â??á??á?·á??â??á??á??á??á?»á??â??á??á??á??á? á?¶á??â??á??á?¼á??á??á?¶á??â??á??á??á??â??á??á??á??á?¹á??á??á??á??á?¼á??â??á?¡á?¾á??á??"
-#: lib/bridgedb/templates/index.html:36
-#, python-format
-msgid "Step %s3%s"
-msgstr "á??á??á? á?¶á?? %s3%s"
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "á??á??á??á??á?¼á??â??á??á?½â??á?¢á??á??á??á??â??á??á?¸â??á??á?¼á??á??á?¶á??â??á??á?¶á??á??á?¾..."
-#: lib/bridgedb/templates/index.html:38
-#, python-format
-msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "á?¥á?¡á?¼á??â?? %s á??á??á??á??á??á??â??á??á??á??á??á?¸á??á??á??â??á??á??â??á??á?¶á??á?? Tor Browser %s"
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "á??á??á??á??â??á??á?¶á??á??á??á??á??á?¾á??â??á??á??á??á?¾â??á??á??á??á??á?¸á??á??á??â??á??á??á??á??â??á?¢á??á??á??"
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. 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
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
#, python-format
-msgid "%sJ%sust give me bridges!"
-msgstr "%sJ%sust á??á??á??á??á??â??á?²á??á??â??á??á??á??á?»á??â??á??á?¼á??â??á??á??á??á??á?¸á??á??á??!"
-
-#: lib/bridgedb/templates/options.html:52
-msgid "Advanced Options"
-msgstr "á??á??á??á??á?¾á??â??á??á??á??á??á?·á??â??á??á??á??á??á??"
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#: lib/bridgedb/templates/options.html:88
-msgid "No"
-msgstr "á??á??"
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#: lib/bridgedb/templates/options.html:89
-msgid "none"
-msgstr "á??á??á??á?¶á??"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: lib/bridgedb/templates/options.html:130
-#, python-format
-msgid "%sY%ses!"
-msgstr "%sY%ses!"
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
-#. beginning of words are present in your final translation. Thanks!
-#. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: lib/bridgedb/templates/options.html:154
-#, python-format
-msgid "%sG%set Bridges"
-msgstr "%sG%set á??á??á??á??á?¸á??á??á??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
index 14595d1..36d6aff 100644
--- a/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ko/LC_MESSAGES/bridgedb.po
@@ -1,22 +1,21 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# ilbe123 <a3057016@xxxxxxxxx>, 2014
# Chris Park <utopinator@xxxxxxxxx>, 2016
# snotree <cknblue@xxxxxxxxx>, 2017
# cwt96 <cwt967@xxxxxxxxx>, 2012
# ê³ ì??ì?± <greenknite@xxxxxxxxx>, 2015
# Hyuntae Chun, 2017
-# Oliver Lee, 2018
+# ebde8080c092fc908416083a701feb30, 2018
# Jamin <bakzaa@xxxxxxxxx>, 2014
# Dr.what <javrick6@xxxxxxxxx>, 2014-2015
# Gu Hong Min <placidmoon1@xxxxxxxxx>, 2015
# ë¥?ì¢?í??, 2015
# Myeongjin <aranet100@xxxxxxxxx>, 2016
-# Oliver Lee, 2019
+# ebde8080c092fc908416083a701feb30, 2019
# ì?´í?¼ì??ì??리 <pcsori@xxxxxxxxx>, 2012
# Philipp Sauter <qt123@xxxxx>, 2018
# Sam Ryoo <samryoo@xxxxxxxxx>, 2014
@@ -27,116 +26,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-08-10 10:10+0000\n"
-"Last-Translator: woo lee <leewoo0614@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Korean (http://www.transifex.com/otf/torproject/language/ko/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ko\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "ì£?ì?¡í?©ë??ë?¤! ë?¹ì? ì?? ì??ì²ì?? 무ì?¸ê°? 문ì ?ê°? ì??ì?µë??ë?¤."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "��"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ë²?그를 ë³´ê³ í??기"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ì??ì?¤ ì½?ë??"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "�경 기�"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "ì?°ë?½í??기"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "모ë?? ì? í??"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRì½?ë?? 보기"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "QR ì½?ë??를 ë¶?ë?¬ ì?¤ë?? ì¤? ì?¤ë¥?ê°? ì??긴 ê²? ê°?ì?µë??ë?¤."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "í??ì?¬ ì?¬ì?©í? ì?? ì??ë?? ë¸?릿ì§?ê°? ì??ì?µë??ë?¤..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s�� "
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor ë¸?ë?¼ì?°ì ? %s를 ë?¤ì?´ë°?ì?µë??ë?¤ "
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s�� "
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s ë¸?릿ì§? %s를 ê°?ì ¸ì?µë??ë?¤"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s�� "
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ì?´ì ? %s ë¸?릿ì§?를 Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
@@ -145,27 +159,27 @@ msgstr "ì?´ì ? %s ë¸?릿ì§?를 Tor ë¸?ë?¼ì?°ì ?ì?? ì¶?ê°?í?©ë??ë?¤ %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sê·¸%së?¥ ë¸?릿ì§? 주ì?¸ì??!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "ê³ ê¸? ì?µì??"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "ì??ë??ì?¤"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ì??ì??"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%së?¤!%s"
@@ -173,69 +187,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%s�%s릿� �기"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ì?´ê²?ì?? ì??ë??ì?¼ë¡? ì??ì?±ë?? ë©?ì??ì§?ì??ë??ë?¤; í??ì? í??ì§? ë§?ì?ì??ì?¤.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "ë?¹ì? ì?? ë¸?릿ì§?ë?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 ì??ê°?ì??ë??ë?¤. ì?´ 기ê°? ë??ì??ì?? ì¶?ê°?ì ?ì?¸ 모ë? ì?´ë©?ì?¼ì?? 무ì??ë? ê²?ì??ë??ë?¤."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (COMMANDs를 ì??ì?´ì?? ì?¬ë?¬ ì?µì??ì?? ë??ì??ì?? 구체í?? í??ì?¸ì??)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB ì?? ì?¤ì? ê²?ì?? í??ì??í?©ë??ë?¤!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ì§?ì??ì?´ ë??ë?? transport TYPEs"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ì ?기, %sì?¼! "
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ì??ë?? ì¹?구!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "ì?´ ì?´ë©?ì?¼ì?? %sì??ê²? %sì?? %sì??ì??\n무ì§?ê°?, ì? ë??ì½? ê·¸ë¦¬ê³ ë°?ì§?ì?´ë¡? ì??ì?±ë??ì??ì?µë??ë?¤."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -246,7 +228,7 @@ msgid ""
msgstr "BridgeDB ë?? ì?¬ë?¬ ì¢?ë¥?ì?? %sì?½ì??í?? ì?¥ì¹?%s ì??ì?? ë¸?릿ì§?를 ì ?ê³µí?©ë??ë?¤.\nì?´ê²?ì?? Tor ë?¤í?¸ì??í?¬ì??ì?? ì?°ê²°ì?? ë??ë??í?? ì??í?¤ë©° ë??êµ°ê°? ì?¸í?°ë?· í?¸ë??í?½ì??\nê°?ì??í??ë?? ì?¬ë??ì?´ ë?¹ì? ì?´ Tor ë?¤í?¸ì??í?¬ë¥¼ ì?¬ì?©í??ê³ ì??ë?¤ë?? ê²?ì?? ì??ë³?í??기 ì?´ë µê²? í?©ë??ë?¤.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -258,7 +240,7 @@ msgstr "ëª?ëª? ë¸?리ì§?ë?? IPv6 주ì??ë?? ì§?ì??í??ë??,\nPluggable Transports
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -267,134 +249,169 @@ msgid ""
"\n"
msgstr "거기ë?¤, BridgeDBë?? %s Pluggable Transportê°? ì??ë?? %s\ní??í?´ë¹ ì§? ë¸?릿ì§?ë?¤ë?? ë§?ì??ì??. ë??ë?¨í?? ì??리ê°?ì§? ì??ê² ì§?ë§?,\nê·¸ë??ë?? ì?¬ë?¬ 모ë¡? ì?¸í?°ë?· ê²?ì?´ ì?°í??를 ë??ì??ì¤?ë??ë?¤.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "'ë¸?릿ì§?'ë???"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %së?? ë?¹ì? ì?´ ê²?ì?´ì?? í?¼í? ì?? ì??ê²? í??ë?? Tor 릴ë ?ì?´ì??ë??ë?¤. "
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "ë¸?릿ì§?를 ì?»ë?? ë?¤ë¥¸ ë°©ë²?ì?´ ì??ì??ê¹?ì???"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 ë¡? ì?´ë©?ì?¼ì?? ë³´ë?´ì£¼ì??ë?? ê²?ì??ë??ë?¤.\nì?´ ì?´ë©?ì?¼ ì??ë¹?ì?¤ë¥¼ í?µí?´ì?? ë³´ë?´ì??ì?¼ í??ë?¤ë?? ê²?ì?? ëª?ì?¬í?´ 주ì?¸ì?? :\n%s, %s, %s"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "ë¸?릿ì§?ê°? ë§?ì?´ ê°?ì?´ì??! ë??ì??ì¤?ì??!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ë§?ì?½ Torê°? ì??ë??í??ì§? ì??ì?¼ë©´, %së¡? ì?´ë©?ì?¼ì?? ë³´ë?´ 주ì?¸ì??. "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ê°?ë?¥í?? í?? ë§?ì?? ì ?보를 í?¬í?¨í?´ì£¼ì?¸ì??.\nì??를 ë?¤ì?´ ë¸?릿ì§? 목ë¡? ë°? ì?¬ì?©í??ë ¤ë?? Pluggable Transport,\nTor ë¸?ë?¼ì?°ì ? ë²?ì ?, Torê°? ì¤? ë©?ì??ì§? ë?±."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "ë?¹ì? ì?? ë¸?릿ì§? í??ë?¤ì?? ë?¤ì??ê³¼ ê°?ì?µë??ë?¤:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "ë¸?릿ì§?를 ì?»ì?¼ì?¸ì??!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "ì??ì??"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "ë¸?릿ì§? ì¢?ë¥?ì?? ê´?í?? ì?µì??ì?? 골ë?¼ 주ì?¸ì??:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 주ì??ê°? í??ì??í?©ë??ê¹??"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "%s ê°? í??ì??í?©ë??ê¹??"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "ë¸?ë?¼ì?°ì ?ê°? ì?¬ì§?ì?? ì ?ì??ì ?ì?¼ë¡? ë¶?ë?¬ì?¤ì§? 못í?©ë??ë?¤."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "ì?? 그림ì?? 문ì??를 ì??ë ¥í??ì?ì??ì?¤..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "ë¸?릿ì§?를 ì?¬ì?©í??ë?? ë°©ë²?"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Tor ë¸?ë?¼ì?°ì ?ì?? ë¸?리ì§?를 ì??ë ¥í??ë ¤ë©´ 먼ì ? %s Tor ë¸?ë?¼ì?°ì ? ë?¤ì?´ë¡?ë??ë¡? ì?´ë??í??ì?ì??ì?¤.\ní??ì?´ì§? %së¡? ì?´ë?? í?? ë?¤ì?? ì§?침ì?? ë?°ë?¼ ë?¤ì?´ë¡?ë?? ë°? ì??ì??ì?? ì??í??í??ì?ì??ì?¤.\nTor ë¸?ë?¼ì?°ì ?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë??í??ì°½ì?´ ë?¨ë©´, 'ì?¤ì ?'ì?? í?´ë¦í??ê³ ì??ë?? ì§?문ì?´ ë??ì?¬ë??ê¹?ì§?\në§?ë²?ì?¬ë¥¼ ë?°ë?¼ì£¼ì?¸ì??:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "ë?¹ì? ì?? ì?¸í?°ë?· ì??ë¹?ì?¤ ì ?ê³µì??(ISP)ê°? Tor ë?¤í?¸ì??í?¬ ì ?ì??ì?? ì°¨ë?¨ ë??ë?? ê²?ì?´í??ë??ì???"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'ì??' í?¹ì?? 'Yes' ë²?í?¼ì?? ë??르ì? í?? 'ë?¤ì??' í?¹ì?? 'Next' ë²?í?¼ì?? ë??ë?¬ 주ì?¸ì??.\në¸?릿ì§?를 ì?¤ì ?í??ì??ë ¤ë©´, ì?´ ë©?ì?¼ë¡? ë°?ì?¼ì? ë¸?릿ì§?를 í??ì?¤í?¸ ë°?ì?¤ì?? ë³µì?¬í??ì? ë?¤ì??,\n'ì ?ì??' í?¹ì?? 'Connect'를 ë??ë?¬ 주ì??ë©´ ì??ë??ë? ê²?ì??ë??ë?¤!\në§?ì?½ 문ì ?ê°? ì??ë?¤ë©´, 'Tor ë?¤í?¸ì??í?¬ ì?¤ì ?' ë§?ë²?ì?¬ì?? 'ë??ì??ë§?' í?¹ì?? 'Help' ë²?í?¼ì?? ë??ë?¬ ë??ì??ì?? ë°?ì?¼ì?¸ì??."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "ì?¼ë°? ë¸?릿ì§?를 ì??ì²í?©ë??ë?¤."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 ë¸?릿ì§?를 ì??ì²í?©ë??ë?¤."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "ì?½ì??í?? ì?¥ì¹?를 TYPE를 í?µí?´ì?? ì??ì²í??ì?¸ì??."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "BridgeDBì?? ê³µê°? GnuPG í?¤ë¥¼ ì?»ì?µë??ë?¤."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..6a5e6b8
--- /dev/null
+++ b/bridgedb/i18n/lt/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,406 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Aiste G <aiste.gvildyte@xxxxxxxxx>, 2016
+# Aiste G <aiste.gvildyte@xxxxxxxxx>, 2016
+# Moo, 2015-2020
+# Saule Papeckyte <saule.papeckyte@xxxxxxxxx>, 2015
+# Edgaras7 <system@xxxxxxxxxxxxxxx>, 2014
+# Tautvydas Zukauskas <lordmu@xxxxxxxxxxxxx>, 2016
+# Tomas Darius Davainis <tomasdd@xxxxxxxxx>, 2018
+# TylQuest, 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Lithuanian (http://www.transifex.com/otf/torproject/language/lt/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: lt\n"
+"Plural-Forms: nplurals=4; plural=(n % 10 == 1 && (n % 100 > 19 || n % 100 < 11) ? 0 : (n % 10 >= 2 && n % 10 <=9) && (n % 100 > 19 || n % 100 < 11) ? 1 : n % 1 != 0 ? 2: 3);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Atleiskite! Kažkas nutiko su jūsų užklausa."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Kalba"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "PraneÅ¡ti apie klaidÄ?"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Pirminis kodas"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Keitinių žurnalas"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ŽymÄ?ti viskÄ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Rodyti QR kodÄ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "Jūsų tinklų tilto linijų QR kodas"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Atrodo, kad gaunant jÅ«sų QR kodÄ?, įvyko klaida."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Å iame QR kode yra jÅ«sų tinklų tilto linijos. Nuskenuokite šį kodÄ?, naudodami QR kodų skaitytuvÄ?, kad nukopijuotumÄ?te savo tinklų tilto linijas į mobilųjį ar kitus įrenginius."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Å iuo metu nÄ?ra prieinami jokie tinklų tiltai..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "GalbÅ«t, jums reikÄ?tų pabandyti %s grįžti atgal %s ir pasirinkti kitÄ? tinklų tilto tipÄ?!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s žingsnis "
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Atsisiųskite %s Tor NarÅ¡yklÄ? %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s žingsnis "
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Gaukite %s tinklų tiltus %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s žingsnis "
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Dabar, %s pridÄ?kite tinklų tiltus į Tor NarÅ¡yklÄ? %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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sT%siesiog suteikite man tinklų tiltus!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "IÅ¡plÄ?stiniai parametrai"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ne"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "nÄ?ra"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "%sT%saip!"
+
+#. TRANSLATORS: Please make sure the '%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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sG%sauti tinklų tiltus"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Štai jūsų tinklų tiltai:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate 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 virÅ¡ijote savo perdavimo limitÄ?. PraÅ¡ome nurimti! Minimalus laikas tarp\nel. laiÅ¡kų yra %s valandos. Tolimesnių laiÅ¡kų, Å¡iuo laikotarpiu bus nepaisoma."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB gali suteikti tinklų tiltus, su keletu %stipų keiÄ?iamųjų perdavimų%s,\nkurie gali padÄ?ti paslÄ?pti jÅ«sų prisijungimus prie Tor tinklo ir taip apsunkinti\nkitiems asmenims, siekiantiems iÅ¡siaiÅ¡kinti ar naudojatÄ?s Tor, jÅ«sų interneto srauto stebÄ?jimÄ?.\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "Yra prieinami kai kurie tinklų tiltai su IPv6 adresais, taÄ?iau kai kurie keiÄ?iamieji perdavimai\nnÄ?ra suderinami su IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "Be to, BridgeDB taip pat turi daug paprastų tinklų tiltų %s be jokių\nkeiÄ?iamųjų perdavimų %s, kurie, galbÅ«t, ir neskamba patraukliai, taÄ?iau vis tiek\ndaugeliu atvejų gali padÄ?ti apeiti interneto cenzÅ«rÄ?.\n\n"
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Kas yra tinklų tiltai?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s Tinklų tiltai %s yra Tor retransliavimai, kurie padeda apeiti cenzÅ«rÄ?."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "Man reikia alternatyvaus būdo tinklų tiltams gauti!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Kitas bÅ«das gauti tinklų tiltų yra siųsti el. laiÅ¡kÄ? į %s. Palikite el. laiÅ¡ko temÄ? tuÅ¡Ä?iÄ?,\no pagrindinÄ?je el. laiÅ¡ko dalyje paraÅ¡ykite \"get transport obfs4\". TurÄ?kite omenyje,\nkad el. laiÅ¡kÄ? privalote iÅ¡siųsti naudodami vieno iÅ¡ Å¡ių el. paÅ¡to tiekÄ?jų adresų: %s arba %s."
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "Mano tinklų tiltai neveikia! Man reikia pagalbos!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Jeigu jÅ«sų Tor NarÅ¡yklÄ? negali prisijungti, pažiÅ«rÄ?kite į %s ir mÅ«sų %s."
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "Štai jūsų tinklų tilto linijos:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Gauti tinklų tiltus!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "NÄ?ra"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "PraÅ¡ome pažymÄ?ti tinklų tilto tipo parametrus:"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "Ar jums reikia IPv6 adresų?"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Ar jums reikia %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "JÅ«sų narÅ¡yklÄ? netinkamai atvaizduoja paveikslus."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "Ä®veskite simbolius iÅ¡ aukÅ¡Ä?iau esanÄ?io paveikslo..."
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "Kaip pradÄ?ti naudotis tinklų tiltais"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
index a1ccaa5..bcb5136 100644
--- a/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/lv/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Ojars Balcers <ojars.balcers@xxxxxxxxx>, 2012
@@ -10,116 +10,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-04-12 18:54+0000\n"
-"Last-Translator: IDRASSI Mounir <mounir.idrassi@xxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: lv\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n != 0 ? 1 : 2);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Atvainojiet! Notikusi ar Jūsu pieprasījumu saistīta kļūme."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Valoda"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ZiÅ?ot par kļūdu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Pirmkods"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "IzmaiÅ?u žurnÄ?ls"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "SazinÄ?ties"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Atlasīt visu"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "ParÄ?dÄ«t QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
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
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Šobrīd nav pieejamu tiltu..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Solis %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Solis %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "SaÅ?emt %s tiltus %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Solis %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
@@ -128,27 +143,27 @@ msgstr "Tagad %s pievienot PÄ?rlÅ«kam Tor tiltus %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sT%sikai dodiet man tiltus!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "LietpratÄ?ju opcijas "
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "NÄ?"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sÄ?!"
@@ -156,69 +171,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Te ir JÅ«su tilti:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "SveicinÄ?ti BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Šobrīd atbalstītie transporta VEIDI:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Sveiks, draug!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "This email was generated with rainbows, unicorns, and sparkles\npriekÅ¡ %s dienÄ? %s pl %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +212,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -241,7 +224,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +233,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kas ir tilti?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Man nepieciešams alternatīvs tiltu iegūšanas veids!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
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".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Te ir Jūsu tiltu līnijas:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "SaÅ?emt Tiltus!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nav"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "LÅ«dzu, izvÄ?lieties tilta veida opcijas:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Vai ir nepieciešamas IPv6 adreses?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Vai ir nepieciešams %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "JÅ«su pÄ?rlÅ«ks neattÄ?lo attÄ?lus pareizi."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "IevadÄ«t burtus no augstÄ?k parÄ?dÄ«tÄ? attÄ?la..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "KÄ? sÄ?kt izmantot JÅ«su tiltus"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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Ä?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Vai JÅ«su Interneta pakalpojumu sniedzÄ?js (ISP) bloÄ·Ä? vai citÄ?dÄ? veidÄ? cenzÄ? savienojumus\nar tÄ«klu Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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\"."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Pieprasīt parastos tiltus."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Pieprasīt IPv6 tiltus."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "PieprasÄ«t Pluggable Transport pÄ?c TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "SaÅ?emt BridgeDB publiskÄ?s GnuPG atslÄ?gas kopiju."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
index 3b33515..7813e69 100644
--- a/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/mk/LC_MESSAGES/bridgedb.po
@@ -1,125 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Cacko Cackoas <cackothe@xxxxxxxxx>, 2015
+# Liljana Ackovska <liljanagjurova@xxxxxxxxx>, 2019
# Viktor Hristov, 2014
-# Zarko Gjurov <zarkogjurov@xxxxxxxxx>, 2017-2018
+# Zarko Gjurov <zarkogjurov@xxxxxxxxx>, 2017-2018,2020
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-11-06 01:52+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-19 11:54+0000\n"
"Last-Translator: Zarko Gjurov <zarkogjurov@xxxxxxxxx>\n"
"Language-Team: Macedonian (http://www.transifex.com/otf/torproject/language/mk/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: mk\n"
"Plural-Forms: nplurals=2; plural=(n % 10 == 1 && n % 100 != 11) ? 0 : 1;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?звинеÑ?е! Се Ñ?лÑ?Ñ?и гÑ?еÑ?ка Ñ?о ваÑ?еÑ?о баÑ?аÑ?е."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?азик"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?Ñ?иÑ?ави пÑ?облем"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?звоÑ?ен код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?ог на измени"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?онÑ?акÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ð?дбеÑ?и Ñ?е"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ð?окажи QR код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ð?ма гÑ?еÑ?ка во добиваÑ?еÑ?о на ваÑ?иоÑ? QR код."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB наиде на гÑ?еÑ?ка."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ð?оменÑ?ално нема доÑ?Ñ?апни моÑ?Ñ?ови..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "ЧекоÑ? %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Ð?Ñ?еземи %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "ЧекоÑ? %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?еми %s моÑ?Ñ?ови %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "ЧекоÑ? %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Сега %s додади ги моÑ?Ñ?овиÑ?е во Tor Browser%s"
@@ -128,27 +144,27 @@ msgstr "Сега %s додади ги моÑ?Ñ?овиÑ?е во Tor Browser%s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sС%sамо даÑ? ми моÑ?Ñ? конекÑ?ии!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Ð?апÑ?едни опÑ?ии"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ð?е"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ниÑ?Ñ?о"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sÐ?%sа! Ð?и Ñ?Ñ?ебааÑ? IPv6 адÑ?еÑ?и."
@@ -156,69 +172,37 @@ msgstr "%sÐ?%sа! Ð?и Ñ?Ñ?ебааÑ? IPv6 адÑ?еÑ?и."
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sÐ?%sвозможи Ð?оÑ?Ñ?ови"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?ва е авÑ?омаÑ?Ñ?ка поÑ?ака; Ð?е молиме не одговаÑ?аÑ?Ñ?е.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Ð?ва е авÑ?омаÑ?Ñ?ка е-поÑ?Ñ?а.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ð?ва Ñ?е ваÑ?иÑ?е моÑ?Ñ?ови:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 Ñ?аÑ?ови. СиÑ?е понаÑ?амоÑ?ни е-поÑ?аки во овоÑ? вÑ?еменÑ?ки пеÑ?иод Ñ?е бидаÑ? игноÑ?иÑ?ани."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ð?: (комбиниÑ?аÑ?Ñ?е Ð?Ð?Ð?Ð?Ð?Ð?Ð? да поÑ?оÑ?иÑ?е повеÑ?е опÑ?ии иÑ?Ñ?овÑ?емено)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?обÑ?едоÑ?довÑ?е во BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Ð?оменÑ?ално подÑ?жани ТÐ?Ð?Ð?Ð?Ð? на Ñ?Ñ?анÑ?поÑ?Ñ?:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?дÑ?аво, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?дÑ?аво, пÑ?иÑ?аÑ?елÑ?!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ð?ваа е-поÑ?Ñ?а беÑ?е Ñ?оздадена Ñ?о дождоÑ?, виножиÑ?а, едноÑ?ози, и иÑ?кÑ?и за %s на %s во %s ."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ð?ко овие моÑ?Ñ?ови не Ñ?е Ñ?оа Ñ?Ñ?о ви Ñ?Ñ?еба, одговоÑ?еÑ?е на оваа е-поÑ?Ñ?а Ñ?о една од\nÑ?ледниве команди во Ñ?одÑ?жина на поÑ?акаÑ?а:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,7 +213,7 @@ msgid ""
msgstr "BridgeDB овозможÑ?ва моÑ?Ñ?ови за повеÑ?е %s Ñ?ипови на Pluggable Transports %s ,\nÑ?Ñ?о можаÑ? да помогнаÑ? пÑ?и маÑ?киÑ?аÑ?е на ваÑ?иÑ?е повÑ?зÑ?ваÑ?а кон Tor мÑ?ежаÑ?а,\nпÑ?авеÑ?Ñ?и Ñ?а\nпоÑ?еÑ?ка за Ñ?екоÑ? коÑ? го надгледÑ?ва ваÑ?иоÑ? Ð?нÑ?еÑ?неÑ? Ñ?ообÑ?аÑ?аÑ? да Ñ?Ñ?вÑ?ди дека вие\nкоÑ?иÑ?Ñ?иÑ?е Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -241,7 +225,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -250,134 +234,169 @@ msgid ""
"\n"
msgstr "Ð?ополниÑ?елно, BridgeDB има многÑ? Ñ?Ñ?андаÑ?дни моÑ?Ñ?ови %sбез ниÑ?Ñ? еден\nPluggable Transports %s пÑ?екÑ? кои можеби не звÑ?Ñ?и кÑ?л, но Ñ?ие Ñ?еÑ?Ñ?Ñ?е можаÑ?\nда помогнаÑ? во заобиколÑ?ваÑ?е на Ð?нÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?аÑ?а во многÑ? Ñ?лÑ?Ñ?аи.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ШÑ?о Ñ?е моÑ?Ñ?ови?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ð?оÑ?Ñ?ови %s Ñ?е Tor Ñ?азли / Ñ?воÑ?ови кои ви помагааÑ? во заобиколÑ?ваÑ?еÑ?о на Ñ?ензÑ?Ñ?аÑ?а."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?и Ñ?Ñ?еба алÑ?еÑ?наÑ?ивен наÑ?ин да добиÑ?ам моÑ?Ñ?ови!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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. \nÐ?абелеÑ?ка: Ð?оÑ?аÑ?е\nда пÑ?аÑ?иÑ?е е-поÑ?Ñ?а коÑ?иÑ?Ñ?еÑ?Ñ?и адÑ?еÑ?а на еден од Ñ?ледниве е-поÑ?Ñ?а / е-маил пÑ?оваÑ?деÑ?и:\n%s, %s или %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ð?Ñ?Ñ?г наÑ?ин да добиеÑ?е моÑ?Ñ?ови е да иÑ?пÑ?аÑ?иÑ?е е-поÑ?Ñ?а на %s. Ð?Ñ?Ñ?авеÑ?е го полеÑ?о наÑ?лов на е-поÑ?Ñ?аÑ?а\nпÑ?азно и напиÑ?еÑ?е \"добиÑ? obfs4 Ñ?Ñ?анÑ?поÑ?Ñ?\" во Ñ?одÑ?жинаÑ?а на поÑ?акаÑ?а на е-поÑ?Ñ?аÑ?а. Ð?абележеÑ?е\nдека моÑ?аÑ?е да иÑ?пÑ?аÑ?иÑ?е е-поÑ?Ñ?а коÑ?иÑ?Ñ?еÑ?Ñ?и адÑ?еÑ?а од еден од Ñ?ледниве е-поÑ?Ñ?а\nпÑ?оваÑ?деÑ?и: %s или %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ð?оиÑ?е моÑ?Ñ?ови не Ñ?Ñ?нкÑ?иониÑ?ааÑ?! Ð?и Ñ?Ñ?еба помоÑ?!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ко Ñ?воÑ?оÑ? Tor не Ñ?абоÑ?и, Ñ?огаÑ? Ñ?Ñ?еба да пÑ?аÑ?иÑ?е е-поÑ?Ñ?а на %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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,\nи Ñ?иÑ?е поÑ?аки кои ги дава Tor во Ñ?лÑ?Ñ?аÑ?оÑ?, иÑ?н."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ð?ко ваÑ?иоÑ? Tor Browser не може да Ñ?е повÑ?зе, погледнеÑ?е на %s и на %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ð?ва Ñ?е ваÑ?иÑ?е моÑ?Ñ? коненÑ?ии:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ð?обиÑ? моÑ?Ñ?ови!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ð?оÑ?Ñ? меÑ?анизими на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB имплеменÑ?иÑ?а 4 меÑ?анизми на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а на моÑ?Ñ?ови: \"HTTPS\", \"Moat\",\n\"Ð?-поÑ?Ñ?а\", и \"РезеÑ?виÑ?ано\". Ð?оÑ?Ñ?овиÑ?е кои не Ñ?е диÑ?Ñ?Ñ?ибÑ?иÑ?ани пÑ?екÑ? BridgeDB го коÑ?иÑ?Ñ?аÑ?\nпÑ?евдо-меÑ?анизмоÑ? \"Ð?иÑ?Ñ?о\". Следнава лиÑ?Ñ?а кÑ?аÑ?ко обÑ?аÑ?нÑ?ва како овие\nмеÑ?анизми Ñ?абоÑ?аÑ? и наÑ?иÑ?е %sBridgeDB меÑ?еÑ?а%s визÑ?елизиÑ?ааÑ? колкÑ? е попÑ?лаÑ?ен Ñ?екоÑ?\nод меÑ?анизмиÑ?е."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "\"HTTPS\" меÑ?анизмоÑ? на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а ги пÑ?едава моÑ?Ñ?овиÑ?е пÑ?екÑ? оваа веб Ñ?Ñ?Ñ?ана.\nÐ?а да земеÑ?е\nмоÑ?Ñ?ови, одеÑ?е на %sbridges.torproject.org%s, одбеÑ?еÑ?е ги опÑ?ииÑ?е кои ги пÑ?еÑ?еÑ?иÑ?аÑ?е, и\nÑ?еÑ?еÑ?е Ñ?а CAPTCHA-Ñ?а / задаÑ?аÑ?а коÑ?а Ñ?ледÑ?ва."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "\"Moat\" меÑ?анизмоÑ? на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а е дел од Tor Browser, коÑ? им овозможÑ?ва на коÑ?иÑ?ниÑ?иÑ?е да\nпобаÑ?ааÑ? моÑ?Ñ?ови внаÑ?Ñ?е од нивниÑ?е Tor Browser поÑ?Ñ?авки. Ð?а да земеÑ?е моÑ?Ñ?ови, одеÑ?е на\nваÑ?иÑ?е %sTor поÑ?Ñ?авки%s на Tor Browser, кликнеÑ?е на \"побаÑ?аÑ? нов моÑ?Ñ?\", Ñ?еÑ?еÑ?е Ñ?а\nCAPTCHA-Ñ?а / задаÑ?аÑ?а коÑ?а Ñ?ледÑ?ва, и Tor Browse авÑ?омаÑ?Ñ?ки Ñ?е ги додаде ваÑ?иÑ?е нови\nмоÑ?Ñ?ови."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Ð?оÑ?иÑ?ниÑ?иÑ?е можаÑ? да побаÑ?ааÑ? моÑ?Ñ?ови пÑ?екÑ? \"E-поÑ?Ñ?а\" меÑ?анизмоÑ? на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а Ñ?о иÑ?пÑ?аÑ?аÑ?е на\nе-поÑ?Ñ?а на %sbridges@xxxxxxxxxxxxxx%s и пиÑ?Ñ?ваÑ?е \"get transport obfs4\" во\nÑ?одÑ?жинаÑ?а на поÑ?акаÑ?а."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "РезеÑ?виÑ?ано"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB одÑ?жÑ?ва мал бÑ?оÑ? на моÑ?Ñ?ови кои не Ñ?е диÑ?Ñ?Ñ?ибÑ?иÑ?ааÑ?\nавÑ?омаÑ?Ñ?ки. Ð?амеÑ?Ñ?о Ñ?оа, ние ги Ñ?езеÑ?виÑ?аме овие моÑ?Ñ?ови за Ñ?аÑ?на диÑ?Ñ?Ñ?ибÑ?иÑ?иÑ?а и\nим ги пÑ?едаваме на Ð?Ð?Ð? и на дÑ?Ñ?гиÑ?е оÑ?ганизаÑ?ии и индивидÑ?алÑ?и на кои им Ñ?е поÑ?Ñ?ебни\nмоÑ?Ñ?ови. Ð?оÑ?Ñ?овиÑ?е кои Ñ?Ñ?о Ñ?е диÑ?Ñ?Ñ?ибÑ?иÑ?ани пÑ?екÑ? \"РезеÑ?виÑ?ано\" меÑ?анизмоÑ? може коÑ?иÑ?ниÑ?иÑ?е да не ги видаÑ?\nподолго вÑ?еме. Ð?абележеÑ?е дека \"РезеÑ?виÑ?ано\" меÑ?анизмоÑ? на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а е\nнаÑ?еÑ?ен \"Ð?еÑ?аÑ?пÑ?еделено\" во даÑ?оÑ?екиÑ?е на %sбазеноÑ? на моÑ?Ñ? доделÑ?ваÑ?а%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?иÑ?Ñ?о"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Ð?оÑ?Ñ?овиÑ?е Ñ?иÑ? меÑ?анизам на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а е \"Ð?иÑ?Ñ?о\" не Ñ?е диÑ?Ñ?Ñ?ибÑ?иÑ?ани пÑ?екÑ? BridgeDB.\nТоа е одговоÑ?ноÑ?Ñ? на опеÑ?аÑ?оÑ?иÑ?е на моÑ?Ñ?ови кои ги диÑ?Ñ?Ñ?ибÑ?иÑ?ааÑ? нивниÑ?е моÑ?Ñ?ови до\nкоÑ?иÑ?ниÑ?иÑ?е. Ð?абележеÑ?е дека во Ð?Ñ?ебаÑ?Ñ?ваÑ?е Реле, новиÑ?е поÑ?Ñ?авени меÑ?анизми на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а\nна моÑ?Ñ?ови велаÑ? \"Ð?иÑ?Ñ?о\" за наÑ?многÑ? до еден ден. Ð?идеÑ?е Ñ?Ñ?пеливи, и\nÑ?огаÑ? Ñ?е Ñ?е пÑ?омени во конкÑ?еÑ?ниоÑ? меÑ?анизам на диÑ?Ñ?Ñ?ибÑ?Ñ?иÑ?а на моÑ?Ñ?.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ð?дбеÑ?еÑ?е опÑ?ии за Ñ?ип на моÑ?Ñ?:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ð?али ви Ñ?Ñ?ебааÑ? IPv6 адÑ?еÑ?и?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?али Ñ?и Ñ?Ñ?еба %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ?иоÑ? пÑ?елиÑ?Ñ?Ñ?ваÑ? не ги покажÑ?ва Ñ?ликиÑ?е пÑ?авилно."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Ð?неÑ?еÑ?е ги каÑ?акÑ?еÑ?иÑ?е од Ñ?ликаÑ?а погоÑ?е:"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ð?ако да запоÑ?неÑ?е Ñ?о коÑ?иÑ?Ñ?еÑ?е на моÑ?Ñ?ови"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Ð?а внеÑ?еÑ?е моÑ?Ñ?ови во Tor Browser, пÑ?во одеÑ?е на %s Tor Browser за пÑ?еземаÑ?е\nÑ?Ñ?Ñ?анаÑ?а %s и поÑ?оа Ñ?ледеÑ?е ги инÑ?Ñ?Ñ?Ñ?кÑ?ииÑ?е за пÑ?еземаÑ?е и Ñ?Ñ?аÑ?Ñ?Ñ?ваÑ?е на Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Ð?Ñ?во, Ñ?Ñ?еба да го %sпÑ?еземеÑ?е Tor Browser%s. Ð?аÑ?еÑ?о УпаÑ?Ñ?Ñ?во за \nкоÑ?иÑ?Ñ?еÑ?е на Tor Browser обÑ?аÑ?нÑ?ва како можеÑ?е да додадеÑ?е ваÑ?и моÑ?Ñ?ови во Tor Browser. Ð?ко коÑ?иÑ?Ñ?иÑ?е\nWindows, Linux, или OS X, %sкликнеÑ?е овде%s за да наÑ?Ñ?иÑ?е повеÑ?е. Ð?ко\nкоÑ?иÑ?Ñ?иÑ?е Android, %sкликнеÑ?е овде%s. "
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?ога диÑ?алогоÑ? 'Tor мÑ?ежни поÑ?Ñ?авки' Ñ?е Ñ?е поÑ?ави, кликнеÑ?е на 'Ð?онÑ?игÑ?Ñ?иÑ?аÑ?' и Ñ?ледеÑ?е\nго инÑ?Ñ?алеÑ?оÑ? додека да ве пÑ?аÑ?а:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Ð?одадеÑ?е ги овие моÑ?Ñ?ови во ваÑ?иоÑ? Tor Browser Ñ?о оÑ?воÑ?аÑ?е на паÑ?амеÑ?Ñ?иÑ?е\nна ваÑ?иоÑ? пÑ?елиÑ?Ñ?Ñ?ваÑ?, кликнÑ?ваÑ?Ñ?и на \"Tor\", и поÑ?оа додаваÑ?Ñ?и ги во полеÑ?о \n\"Ð?возможи моÑ?Ñ?\"."
-#. 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 "Ð?али ваÑ?иоÑ? Ð?нÑ?еÑ?неÑ? Ñ?еÑ?виÑ? пÑ?оваÑ?деÑ? (ISP) блокиÑ?а или Ñ?ензÑ?Ñ?иÑ?а повÑ?зÑ?ваÑ?а кон Tor мÑ?ежаÑ?а?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Ð?обаÑ?аÑ? пÑ?икÑ?иени Tor моÑ?Ñ?ови.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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 мÑ?ежни подеÑ?Ñ?ваÑ?а' и Ñ?ледеÑ?е ги инÑ?Ñ?Ñ?Ñ?кÑ?ииÑ?е."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?обаÑ?Ñ?ва Ñ?Ñ?андаÑ?дни моÑ?Ñ?ови."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?обаÑ?Ñ?ва IPv6 моÑ?Ñ?ови."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?обаÑ?Ñ?ва Pluggable Transport по Ñ?ип."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Ð?обаÑ?аÑ? IPv6 моÑ?Ñ?ови.)"
-#. 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 "Ð?Ñ?еземи копиÑ?а од Ñ?авниоÑ? GnuPG клÑ?Ñ? на BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Ð?обаÑ?аÑ? obfs4 пÑ?икÑ?иени моÑ?Ñ?ови.)"
diff --git a/bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..3251860
--- /dev/null
+++ b/bridgedb/i18n/ml/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,404 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Abhishek C <abhishek.mvr@xxxxxxxxxxx>, 2018
+# Aman Anifer <amananiferfiaff@xxxxxxxxx>, 2020
+# ameer pb <ameerpbekm@xxxxxxxxx>, 2019
+# Christy K Kurian <christykurian2494@xxxxxxxxx>, 2018
+# NITHIN <nithinsn@xxxxxxxxxxxxxx>, 2018
+# Salman Faris <farissalmannbr@xxxxxxxxx>, 2015
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Malayalam (http://www.transifex.com/otf/torproject/language/ml/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: ml\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "à´?àµ?ഷമിà´?àµ?à´?àµ?! നിà´?àµ?à´?à´³àµ?à´?àµ? à´?à´àµ?യർതàµ?ഥനയിൽ à´¤àµ?à´±àµ?à´±àµ?à´£àµ?à´?àµ? "
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à´à´¾à´· "
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "�ര� ബ�� റിപ�പ�ാർ���� ��യ�യ��"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "സ�ാഴ�സ� ��ാഡ�"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "മാറ�റ വിവരപ�പ���ി� "
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "�ല�ലാ� തിര�����������"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr " QRCode �ാണി�����"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "നി���ള��� പാല� ല�ന��ൾ വ�ണ��ി QRCode"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "നിà´?àµ?à´?à´³àµ?à´?àµ? à´?àµ?à´¯àµ? à´?ർ à´?àµ?à´¡àµ? à´²à´àµ?യമാà´?àµ?à´?àµ?à´¨àµ?നതിൽ à´?à´°àµ? പിശà´?àµ? à´¸à´?à´à´µà´¿à´?àµ?à´?àµ?"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+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/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "തൽസമയà´? à´?à´°àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´? à´²à´àµ?യമലàµ?à´²."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "�ിലപ�പ�ൾ താ���ൾ �ര� ശതമാന� 1%s പ�റ�ില����� പ�യി 1%s മറ�റ�ര� ബ�രിഡ��� സ�വ��രി����� "
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "സ�റ�റ�പ� %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "��ർ ബ�ര�സർ %s ഡ�ൺല�ഡ� ��യ�യ�� %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "സ�റ�റ�പ� %s2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "�ര� ശതമാന� %s ബ�രിഡ��� സ�വ��രി����� %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "സ�റ�റ�പ� %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "�നി �ര� ശതമാന� %s ബ�രിഡ��� ��ർ ബ�ര�സ�റി ല��� �����ി����ർ����� %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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%s ബ�രിഡ����ൾ തര�� %s "
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "����തൽ ��രമ��രണ���ൾ "
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "വ�ണ��"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "�ന�ന�മില�ല"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, 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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%s ബ�രിഡ����ൾ �������� %s "
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "�താണ� താ���ള��� ബ�രിഡ����ൾ "
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate 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 . à´? സമയതàµ?à´¤àµ? വിശàµ?à´·à´¿à´?àµ?à´? à´?à´®àµ?യിലàµ?à´?ൾ à´?à´µà´?ണിà´?àµ?à´?àµ?à´¨àµ?നതാണàµ? "
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "����ാണ�ന�ന ബ�രിഡ����ൾ �ല�ല നി���ൾ���� വ�ണ��ത����ിൽ, താഴ� തന�നിരി����ന�ന �ത����ില�� �ര� �മാൻഡ� മ�സ�സ��� ബ�ഡിയിൽ �ഴ�തി �മ�ലിന� മറ�പ�ി �യി �യ�����"
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? ഡിബിà´?àµ?à´?àµ? പല തരതàµ?തിൽ à´?à´³àµ?à´³ à´ªàµ?à´³à´?àµ?à´?àµ?â??ബിൽ à´?àµ?രാൻസàµ?â??à´ªàµ?ർà´?àµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?ൾ %s തരപàµ?à´ªàµ?à´?àµ?à´¤àµ?താൻ à´?à´´à´¿à´¯àµ?à´? %s, à´?തിനàµ? à´?àµ?ർ à´¶àµ?à´?à´?ലയിലàµ?à´?àµ?à´?àµ?à´³àµ?à´³ ബനàµ?à´§à´? à´?à´°àµ?à´?àµ?à´?à´¾à´?àµ?à´?ാൻ സഹായിà´?àµ?à´?àµ?à´?, à´?à´¤àµ? നിà´?àµ?à´?à´³àµ?à´?àµ? à´?à´¨àµ?റർനàµ?à´±àµ?à´±àµ? à´?താà´?à´¤à´? à´?à´£àµ?à´?àµ?à´?àµ?à´£àµ?à´?à´¿à´°à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´?à´¤àµ?രാൾà´?àµ?à´?àµ?à´? നിà´?àµ?à´?ൾ à´?àµ?ർ à´¨àµ?à´±àµ?à´±àµ?â??വർà´?àµ?à´?àµ? à´?പയàµ?à´?à´¿à´?àµ?à´?àµ?à´?യാണàµ? à´?à´²àµ?ലയàµ? à´?à´¨àµ?à´¨àµ? മനസàµ?സിലാà´?àµ?à´?àµ?à´¨àµ?നതàµ? à´?àµ?à´?àµ?തൽ à´¦àµ?രിതപàµ?ർണà´? à´?à´?àµ?à´?ാൻ à´?à´´à´¿à´¯àµ?à´? \n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "à´? പി വി 6 à´®àµ?ൽവിലാസà´? à´?പയàµ?à´?à´¿à´?àµ?à´?àµ?à´¨àµ?à´¨ à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?ൾ à´²à´àµ?യമാണàµ? , à´?à´¨àµ?നിരàµ?à´¨àµ?നാലàµ?à´? à´?à´¿à´² à´ªàµ?à´²à´?àµ?à´?àµ?â??ബിൾ \nà´?àµ?രാൻസàµ?à´ªàµ?ർà´?àµ?à´?àµ?à´?ൾ à´? പി വി സിà´?àµ?à´¸àµ? à´ªàµ?à´°àµ?à´¤àµ?à´¤à´? à´?à´³àµ?ളതലàµ?ല \n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "à´?àµ?à´?ാതàµ? à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? ഡിബിà´?àµ?à´?àµ? à´?നവധി à´ªàµ?à´²à´?àµ?à´?àµ?â??ബിൾ à´?àµ?രാൻസàµ?à´ªàµ?ർà´?àµ?à´?àµ?à´?ൾ %s à´?à´²àµ?ലാതàµ?à´¤ à´ªàµ?à´²àµ?യിൻ à´?ൾ വാനില à´¬àµ?à´°à´¿à´¡àµ?à´?àµ?à´?ൾ %s à´?à´£àµ?à´?àµ? \nà´?à´¤àµ? à´?àµ?ൾà´?àµ?à´?ാൻ à´?à´¤àµ?à´° à´°à´¸à´? à´?à´²àµ?à´²àµ?à´?àµ?à´?à´¿à´²àµ?à´? \nà´?വയàµ?à´?àµ?à´?àµ? പല സാഹà´?à´°àµ?യതàµ?തിലàµ?à´? à´?à´¨àµ?റർനàµ?à´±àµ?à´±àµ? à´¸àµ?ൻസർഷിപàµ? à´?ഴിവാവാà´?àµ?à´?ാൻ പറàµ?à´±àµ?à´? \n\n"
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "�ന�ത�����യാണ� ബ�രിഡ����ൾ ?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s ബ�രിഡ����ൾ %s �ന�ന� പറയ�ന�നത� �ന�റർന�റ�റ� സ�ന�സര�ഷിപ� �ഴിവാ���ാനായി�� മാറി മാറി �യ����ന�ന ��റിന�റ സ�����ളാണ� "
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "�നി���� ബ�രിഡ����ൾ �ി���ാൻ �ന�നി�വി����ള�ള വഴി�ൾ വ�ണ� "
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "�ന�റ� ബ�രിഡ����ൾ പ�രവർത�തി����ന�നില�ല ! �നി���� സഹായ� �വശ�യമാണ� !"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "നി���ള��� ��ർ ബ�ര�സറ�മായി ബന�ധിപ�പി���ാൻ �ഴിയ�ന�നില�ല����ിൽ, ദയവായി %s �� ����ള��� %s �� ന������."
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "�താണ� നി���ള��� ബ�രിഡ����ള��� പ���ി� :"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "ബ�രിഡ����ൾ സ�വ��രി����� "
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "ബ�രിഡ��� വിതരണ സ�വിധാന�"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "�ന�ന�മില�ല"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "ദയവായി à´¬àµ?à´°à´¿à´¡àµ?à´?àµ? à´µà´?à´àµ?à´¦à´?àµ?à´?ൾ തിരà´?àµ?à´?àµ?à´?àµ?à´?àµ?à´?àµ?à´? :"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "നി���ൾ�� � പി വി 6 മ�ൽവിലാസ� �വശ�യമ�ണ���?"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "നി���ൾ�� �ര� �വശ�യമ�ണ��� %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "നി���ള��� ബ�ര�സർ �ിത�ര���ൾ വ�ണ�� ര�തിയിൽ പ�രദര�ശിപ�പി����ന�നില�ല ."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr " മ��ളിൽ �ാണ�ന�ന �ിത�രത�തിൽ നിന�ന�� ���ഷര���ൾ ��ർ����� "
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "����ന� ബ�രിഡ����ൾ �പയ��ി���� ത������� "
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(വ�യ��തമല�ലാത�ത ��ർ ബ�രിഡ��� �പ�പ�ി�����)"
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..f0141d9
--- /dev/null
+++ b/bridgedb/i18n/mr/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,400 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Prachi Joshi <josprachi@xxxxxxxxx>, 2019
+# Vikrant Korde <vikrant.korde@xxxxxxxxx>, 2015-2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Marathi (http://www.transifex.com/otf/torproject/language/mr/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: mr\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "��षमस�व! �ाह�तर� ��� �ाल� �ह�"
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¤à¤¾à¤·à¤¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "द�ष न��दवा"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "स��र�स ��ड"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "बदल ल��"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "सर�व निवडा"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "��य��र ��ड दर�शवा"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "��य� �र ��ड मिळवताना �डबड �ाल�"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "मिळवताना �डबड �ाल�"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+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/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "सध�या ��णत�ह� ब�रि��स �पलब�ध नाह�त ... "
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "त�म�ह� %s मा�� %s �ा�न द�सरा ब�रि� प�र�ार निवडावा"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "पायर� %s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "डा�नल�ड %s ��र ब�रा��र %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "पायर� %s2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "%s प�ल %s मिळवा"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "पायर� %s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "�ता %s ब�रि��स ��र ब�रा��र मध�य� �ा�ा %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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sम%sला ब�रि��स द�या!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "प�र�त पर�याय"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "नाह�"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "�ाह�ह� नाह�"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, 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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%s प�ल %s मिळवा"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "य�थ� �पला प�ल �ह�:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate 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 तास �ह�. प�ढ�ल सर�व �-म�ल�स �ड� द�र�ल��ष ��ल� �ा�ल."
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "�ाह� ब�रि��स IPv6 वर द���ल �पलब�ध �ह�त, पण �ाह� प�ल��बल\n��रा�स�प�र�� स�स��त नाह�त.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "ब�रि��स म�हण�� �ाय?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "मला ब�रि��स मिळवण�यासाठ� पर�याय� मार�� हवा �ह�!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "मा�� ब�रि��स �ार�य �रत नाह�! मला मदत हव� �ह�!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "�पल�या ब�रि� �ळ�"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "%s प�ल %s मिळवा"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr ""
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "ब�रि� प�र�ारात�ल पर�याय निवडा:"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "�पणास IPv6 पत�त� (addresses) हव� �ह�त �ा? "
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "�पणास %s हव� �ह� �ा?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "�पला ब�रा��र प�रतिमा न�� दा�वत नाह�. "
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "वर�ल प�रतिम�त�ल शब�द लिहा"
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "�पल� ब�रि��स �स� वापराव�त"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
index ca9505f..45f6298 100644
--- a/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ms_MY/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# abuyop <abuyop@xxxxxxxxx>, 2017
@@ -15,116 +15,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-05-09 01:07+0000\n"
-"Last-Translator: abuyop <abuyop@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ms_MY\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Maaf! Terdapat sedikit kesulitan dengan permintaan anda."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Bahasa"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Lapor kesilapan kod"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kod Sumber"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Sejarah log"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kenalan"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Pilih Semua"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Tunjuk Kod QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR Kod untuk talian '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 "Alamak, spaghettios!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Terdapat ralat ketika cuba mendapatkan KodQR anda."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 Kod ini mengandungi talian 'bridge' anda. Sila imbas QR Kod untuk membuat salinan talian 'bridge' ke mobil dan alat-alat lain"
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Tidak ada alat 'bridge' pada masa ini..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Anda boleh cuba %s balik ke %s dan pilih jenis 'bridge' lain!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Langkah %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Muat turun%s Pelayar Web Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Langkah%s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Dapatkan %s titi %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Langkah%s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
@@ -133,27 +148,27 @@ msgstr "Kemudian%s tambah bridges tersebut ke Pelayar Web Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sPilih%s secara automatik 'bridges'!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Pilihan Lanjutan"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Tidak"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "tiada"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sY%sa!"
@@ -161,69 +176,37 @@ msgstr "%sY%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%suna Bridges"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ini adalah mesej automatik; tidak perlu balas.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ini adalah titi anda:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 mencapai had yang ditetapkan. Harap bersabar! Masa minimum yang ditetapkan diantara email adalah %s jam. Mana-mana emel yang di hantar pada masa ini tidak akan dilayan."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (cantum COMMANDs untuk mendapat lebih dari satu pilihan dalam satu)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Selamat Datang ke BridgeDB"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "JENIS angkutan semasa yang disokong:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hai, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hai, kawan!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Kunci Awam"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Email ini dihasilkan dengan pelangi,kuda bertanduk satu, dan kelipan untuk %s diatas %s pada %s"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,7 +217,7 @@ msgid ""
msgstr "BridgeDB boleh memberi sambungan 'bridge' dengan beberapa %sjenis sambungan (Pluggable Transports)%s,\nyang boleh meyembungi hubungan anda dalam Rangkaian Tor, yang membolehkan rangkaian anda dilindungi daripada pihak awam yang menapis litar Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -246,7 +229,7 @@ msgstr "Bridge tertentu dengan alamat-alamat IPv6 juga boleh didapati, walaupun
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -255,134 +238,169 @@ msgid ""
"\n"
msgstr "Selain itu, BridgeDB mempunyai banyak bridges yang dicadang %stanpa diperlukan\nPluggable Transports %s yang boleh memberi rasa tidak sedap, tetapi ia masih boleh menolong rangkaian anda dilindungi dalam kebanyakan kes.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Apakah itu 'bridges'?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridges %s adalah sambungan Tor yang menolong anda dari tapisan internet."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Saya perlukan jalan lain untuk dapatkan titi!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Cara lain untuk dapatkan bridge adalah untuk menghantar email kepada %s. Sila ambil perhatian anda harus\nmenghantar email dengan mengunakan alamat yang diberi oleh syarikat yang menyediakan email:\n%s,%s atau %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "'Bridge' saya tidak berfungsi! Saya perlukan bantuan!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Jika konfigurasi Tor tidak berfungsi, anda patut email %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Sila beri sebanyak mungkin informasi tentang kes anda, sila beri kandungan senarai bridge dan hubungan Pluggable Transport yang telah diguna, versi Pelayar Web Tor, dan segala mesej yang Tor paparkan, dan lain-lain .. "
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Berikut adalah bridge anda:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Dapat sambungan Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Tiada"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Sila pilih jenis bridge:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Anda perlukan alamat IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Perlukah anda %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Pelayar anda tidak memaparkan imej dengan betul."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Masukkan imej aksara yang tertera..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Bagaimana cara untuk mula mengunakan bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Untuk masuk bridges ke dalam Pelayar Web Tor, langkah pertama sila pilih %s halaman muat turun Pelayar Web Tor \n%s dan ikut arahan untuk muat turun dan mula Pelayar Web Tor Browser "
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Bila pilihan dialog jenis hubungan 'Tor Network Settings' dipaparkan, klik 'Konfigurasi' dan ikut nasihat yang disyorkan sehingga:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Adakah Pembekal Perkhidmatan Internet saya (ISP) menghalang sambungan kepada rangkaian Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Pilih 'Ya' dan klik 'langkah seterusnya'. Untuk konfigurasi bridge baru, buat salinan jaringan bridges ke dalam kotak input teks. Step akhir, klik 'Hubung', dan anda patut dapat keputusan positif! Jika anda ada kesulitan, sila cuba klik 'Bantuan' dalam 'Tor Network Settings' guru untuk bantuan seterusnya"
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Papar mesej ini."
-
-#. 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 "Pinta bridges yang disyorkan."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Pinta IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pinta jalinan Pluggable Transport secara TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Dapatkan salinan dari BridgeDB GnuPG kunci awam."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
index 60e81a7..7f829a5 100644
--- a/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nb/LC_MESSAGES/bridgedb.po
@@ -1,131 +1,150 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Allan Nordhøy <epost@xxxxxxxxxxxxxxxx>, 2014
# Allan Nordhøy <epost@xxxxxxxxxxxxxxxx>, 2016-2017
+# Arne Fjotland Holmen <afjo@xxxxxxxxxxxxxx>, 2020
# Erik Matson <erik@xxxxxxxxxxxxxxx>, 2015
# Harald H. <haarektrans@xxxxxxxxx>, 2014
# Kristian Andre Henriksen <kris.andre.h@xxxxxxxxx>, 2015
+# LarsMagnusHerland <lars.magnus@xxxxxxxxxxxxxxx>, 2020
# 81149148127a5edca7d06dcbfba79969, 2013
+# 09d0a572947e2a725c5d26b354f13c4c, 2019
# PÃ¥l Fiksdal <plf715@xxxxxxxxx>, 2015
-# Per Thorsheim <transifex@xxxxxxxxxxxxx>, 2015
+# Per Thorsheim, 2015
# thor574 <thor.hovden@xxxxxxxxx>, 2014
+# eab1793e5400043c122a2435c33fe68d, 2019
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2017-12-29 18:29+0000\n"
-"Last-Translator: Allan Nordhøy <epost@xxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Norwegian Bokmål (http://www.transifex.com/otf/torproject/language/nb/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: nb\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Beklager! Noe gikk galt med forespørselen din."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Språk"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Innrapporter feil"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kildekode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Endringslogg"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Velg alt"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Vis QR-kode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-kode for dine brolinjer"
-#. 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 "Oisann!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Det oppsto en feil ved innhenting av din QR-kode."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
-msgstr "Denne QR koden inneholder dine brolinjer. Skann den med en QR leser for å kopiere dine brolinjer over på mobile og andre enheter."
+msgstr "Denne QR-koden inneholder dine brolinjer. Skann den med en QR-leser for å kopiere dine brolinjer over på mobile og andre enheter."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Det er for tiden ingen tilgjengelige broerâ?¦"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Kanskje du bør prøve %s gå tilbake til %s og velge en annen brotype!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Steg %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Last ned %s Tor-nettleseren %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Steg %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Tilknytt %s broer %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Steg %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
@@ -134,27 +153,27 @@ msgstr "NÃ¥ %s legg til broer til Tor-nettleseren %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%sare gi meg noen broer!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Avanserte valg"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ingen"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -162,69 +181,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sT%silknytt broer"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er en automatisert melding; ikke svar.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dette er en automatisk e-post.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Her er dine broer:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Du har overskredet hastighetsbegrensningen. Ta det med ro! Minste tid mellom e-poster er %s timer. Alle videre e-poster i denne tidsperioden vil bli ignorert."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMMANDOer: (kombiner KOMMANDer to å angi flere valg samtidig)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkommen til BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Nåværende støttede transport TYPEr:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo, lille venn!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Offentlige nøkler"
-
-#. TRANSLATORS: This string will end up saying something like:
-#. "This email was generated with rainbows, unicorns, and sparkles
-#. for alice@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Denne e-posten ble laget med regnbuer, enhjørninger og stjerneskudd for %s på %s klokken %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Om disse broene ikke er det du trenger, svar på denne e-posten med en av\nfølgende kommandoer i meldingsteksten:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,7 +222,7 @@ msgid ""
msgstr "I BridgeDB finnes broer med flere %styper av pluggbare transporter%s,\nsom kan hjelpe deg med å tilsløre dine tilkoblinger til Tor-nettverket, noe som gjør det\nvanskelig for noen som overvåker din internett-trafikk å fastsette hvorvidt du\nbruker Tor eller ei\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -247,7 +234,7 @@ msgstr "Noen broer med IPv6-adresser er også tilgjelgelige, dog er noen pluggba
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -256,134 +243,169 @@ msgid ""
"\n"
msgstr "Merk også, BridgeDB har massevis av standardbroer med fabrikkoppsett %s uten\nnoen pluggbare transporter %s hvilket kanskje ikke høres så tøft ut, men de kan fremdeles\nbehjelpe omgåelse av Internettsensur i de fleste fall.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Hva er broer?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Broer %s er Tor-rutingsstafettoppsett som hjelper deg med å omgå sensur."
+msgstr "%s Broer %s er Tor-reléoppsettet som hjelper deg med å omgå sensur."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Jeg trenger en alternativ måte å få broer på!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "En annen måte tilknytte seg broer er å sende en e-post til %s. Merk at du må sende\ne-post fra en adresse tilhørende en av følgende e-posttilbydere:\n%s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "En annen måte å tilknytte seg broer på er å sende en e-post til %s. Merk at du må\nsende e-posten fra en adresse tilhørende en av følgende e-post-tilbydere:\n%s eller %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Broene mine virker ikke! Jeg trenger hjelp!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Hvis din Tor ikke virker, burde du skrive e-post til %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Prøv å få med så mye info om ditt brukstilfelle du kan, inkludert en liste over\nbroene og de pluggbare transportene du prøvde å bruke, din Tor-nettleser-versjon,\nog alle meldinger Tor måtte ha produsert, osv."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Hvis Tor-nettleseren ikke kan koble til, kan du ta en titt på %s og vår %s. "
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Her er dine bro-linjer:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Tilknytt broer!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservert"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Gjør valg for brotype:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Trenger du IPv6-adresser?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Trenger du en %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Nettleseren din viser ikke bilder ordentlig."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Skriv inn bokstavene fra bildet ovenforâ?¦"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Hvordan starte med bruk av dine broer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "For å sette opp broer i Tor-nettleseren, gå først til %s siden for nedlasting av Tor-nettleser\n%s følg så instruksene for nedlasting og start av Tor-nettleseren."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Når 'Tor nettverks-innstillinger' dialogboksen spretter opp, trykk på 'oppsett' og følg\nveiviseren til den forespør:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Sensurerer, eller blokkerer på annen måte, din internetttilbyder (ISP) tilkoblinger\ntil Tor-nettverket?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Velg 'Ja' og klikk så 'Neste'. For å sette opp de nye broene dine, kopier og\nlim inn brolinjene i tekstboksen. Til slutt, trykk 'Koble til', og\ndu burde være klar til kamp! Hvis du får problemer, trykk 'Hjelp'\n-knappen i \"Tor-nettverksinnstillinger'-veiviseren for ytterligere hjelp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Vis denne meldingen."
-
-#. 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 "Be om broer med \"vanilla\" fabrikkoppsett."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Etterspør IPv6-broer."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Be om en pluggbar transport etter TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Få kopi av BridgeDBs offentlige GnuPG-nøkkel."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
index 62ada3b..71c26fc 100644
--- a/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Adriaan Callaerts <adriaan.callaerts@xxxxxxxxx>, 2013
# André Koot <meneer@xxxxxxxx>, 2016
# Ann Boen <ann.boen@xxxxxxxxx>, 2014
@@ -12,130 +11,147 @@
# Dick, 2014
# Johann Behrens <info@xxxxxxxxxxxxxx>, 2013
# Joren Vandeweyer <jorenvandeweyer@xxxxxxxxx>, 2019
+# kwadronaut <kwadronaut@xxxxxxxxxxxxx>, 2019
# 53a60eabbf5124a226a7678001f9a57b, 2015
# Meteor0id, 2019
+# Meteor0id, 2019-2020
# Not Much <1028484728393@xxxxxxxxxxxxxx>, 2018
# Shondoit Walker <shondoit@xxxxxxxxx>, 2011
# Marco Brohet <inactive+therbom@xxxxxxxxxxxxx>, 2012
# Tom Becht <tombecht@xxxxxxx>, 2014
# Tonko Mulder <tonko@xxxxxxxxxxxxxx>, 2015
-# Tonnes <tonnes.mb@xxxxxxxxx>, 2019
+# Tonnes <tonnes.mb@xxxxxxxxx>, 2019-2020
# math1985 <transifex@xxxxxxxxxxxxxxxxxxx>, 2013
# BBLN <webmaster@xxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-09-09 13:57+0000\n"
-"Last-Translator: Meteor0id\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Dutch (http://www.transifex.com/otf/torproject/language/nl/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: nl\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Er is iets misgegaan met uw aanvraag."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Taal"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Een bug melden"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Broncode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Lijst van wijzigingen"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Alles selecteren"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QRCode tonen"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QRCode voor uw bridge regels"
-#. 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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Er was een fout tijdens het ophalen van uw QRCode."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 regels. Scan het met een QRCode lezer om uw bridge regels te kopiëren naar mobiele of andere apparaten."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Er zijn momenteel geen bridges beschikbaar..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Misschien moet je proberen %s terug te gaan %s en een ander bridge type te selecteren!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Stap %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Stap %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
-msgstr ""
+msgstr "%sBridges%s verkrijgen"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Stap %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
@@ -144,27 +160,27 @@ msgstr "Nu %s voeg de bridges toe aan Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sG%seef me gewoon bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Geavanceerde opties"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nee"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
-msgstr ""
+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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -172,69 +188,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%srijg Bridges"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr ""
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Dit is een geautomatiseerd e-mailbericht.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Hier zijn je bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
-msgstr ""
-
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr ""
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr ""
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr ""
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr ""
+msgstr "U hebt de snelheidslimiet overschreden. Graag rustiger aan! De minimale tijd tussen\ne-mailberichten is %s uur. Alle verdere e-mails tijdens deze periode worden genegeerd."
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Als deze bridges niet zijn wat u nodig hebt, beantwoord dit e-mailbericht\ndan met een van de volgende opdrachten in de hoofdtekst van het bericht:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -242,158 +226,193 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr ""
+msgstr "BridgeDB kan bridges met meerdere %stypen Pluggable Transports%s aanbieden,\ndie kunnen helpen bij het verduisteren van uw verbindingen met het Tor Network, waardoor het\nmoeilijker wordt voor anderen om uw internetverkeer te bekijken en vast te stellen dat u\nTor gebruikt.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr ""
+msgstr "Er zijn ook enkele bridges met IPv6-adressen beschikbaar, hoewel sommige Pluggable\nTransports niet IPv6-compatibel zijn.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr ""
+msgstr "Verder heeft BridgeDB genoeg gewone vanilla-bridges %s zonder enige\nPluggable Transports %s, wat misschien niet zo cool klinkt, maar in veel gevallen\nkunnen deze toch internetcensuur helpen omzeilen.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr ""
+msgstr "%s Bridges %s zijn Tor-relays die u helpen censuur te omzeilen."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
-msgstr ""
+msgstr "Ik heb een alternatieve manier nodig om bridges te verkrijgen!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Een andere manier om bridges te verkrijgen is een e-mail sturen naar %s. Laat het\nonderwerp van de e-mail leeg en schrijf 'get transport obfs4' in de berichttekst van de e-mail. Houd er\nrekening mee dat u de e-mail moet sturen door gebruik te maken van een adres van een van de volgende\n e-mailproviders: %s of %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
-msgstr ""
+msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Als uw Tor Browser geen verbinding kan maken, bekijk dan de %s en onze %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
-msgstr ""
+msgstr "Dit zijn uw bridge-regels:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
-msgstr ""
+msgstr "Bridges verkrijgen!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Bridge-distributiemechanismen"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementeert vier mechanismen voor het distribueren van bridges: 'HTTPS', 'Moat',\n'Email' en 'Reserved'. Bridges die niet via BridgeDB worden gedistribueerd,\ngebruiken het pseudomechanisme 'None'. De volgende lijst geeft een korte uitleg\nover hoe mechanismen werken, en onze %smetrische gegevens over BridgeDB%s\nvisualiseren hoe populair elk van deze mechanismen is."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Het distributiemechanisme 'HTTPS' deelt bridges uit via deze website. Ga naar\n%sbridges.torproject.org%s, selecteer de opties van uw voorkeur en los\nde daaropvolgende CAPTCHA op om bridges te verkrijgen."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Het distributiemechanisme 'Moat' is onderdeel van Tor Browser, waardoor\ngebruikers bridges kunnen aanvragen vanuit hun Tor Browser-instellingen. Om\nbridges te verkrijgen, gaat u naar de %sTor-instellingen%s van uw Tor Browser,\nklik op 'Een nieuwe bridge aanvragen', los de daaropvolgende CAPTCHA op, en\nTor Browser voegt automatisch uw nieuwe bridges toe."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Gebruikers kunnen bridges uit het distributiemechanisme 'Email' aanvragen door een e-mailbericht\nnaar %sbridges@xxxxxxxxxxxxxx%s te sturen en 'get transport obfs4' in de hoofdtekst\nvan het e-mailbericht te schrijven."
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Gereserveerd"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB beheert een klein aantal bridges die niet automatisch\nworden gedistribueerd.\nIn plaats daarvan reserveren we deze bridges voor handmatige distributie en\ndelen we deze uit aan NGO's en andere organisaties en personen die bridges nodig\nhebben. Bridges die via het mechanisme 'Reserved' worden gedistribueerd, zien\nmogelijk lange tijd geen gebruikers. Houd er rekening mee dat het distributiemechanisme\n'Reserved' 'Unallocated' wordt genoemd in bestanden voor %sbridge-pooltoewijzing%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Geen"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Bridges waarvan het distributiemechanisme 'None' is, worden niet door BridgeDB gedistribueerd.\nHet is de verantwoordelijkheid van de beheerder van de bridge om zijn of\nhaar bridges naar gebruikers te distribueren. Houd er rekening mee dat bij het\nzoeken naar relays een nieuw opgezet bridgedistributiesysteem tot ongeveer\néén dag 'None' aangeeft. Heb een beetje geduld, en dit verandert vanzelf naar\nhet actuele distributiemechanisme van de bridge.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
-msgstr ""
+msgstr "Selecteer opties voor bridge-type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
-msgstr ""
+msgstr "Hebt u IPv6-adressen nodig?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
-msgstr ""
+msgstr "Hebt u een %s nodig?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
-msgstr ""
+msgstr "Uw browser geeft afbeeldingen niet goed weer."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
-msgstr ""
+msgstr "Voer de tekens in van de bovenstaande afbeelding..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
-msgstr ""
+msgstr "Beginnen met het gebruik van uw bridges"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Eerst dient u %sTor Browser te downloaden%s. Onze Tor Browser-\ngebruikershandleiding legt uit hoe u uw bridges aan Tor Browser kunt toevoegen.\n Als u Windows, Linux of OS X gebruikt, %sklik dan hier%s voor meer info.\n Als u Android gebruikt, %sklik dan hier%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Voeg deze bridges toe aan uw Tor Browser door uw browservoorkeuren\nte openen, op 'Tor' te klikken, en ze dan aan het veld 'Een bridge opgeven' toe\nte voegen."
-#. 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 ""
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Niet-verdoezelde Tor-bridges aanvragen.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr ""
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr ""
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr ""
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr ""
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6-bridges aanvragen.)"
-#. 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 ""
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(obfs4-verdoezelde bridges aanvragen.)"
diff --git a/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po
index d8fc5c3..eb322fa 100644
--- a/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nl_BE/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Katrien Igodt <kigodt@xxxxxxxxx>, 2015
@@ -8,116 +8,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-06-08 07:09+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: nl_BE\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Onze excuses! Er ging iets mis met uw aanvraag."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Taal"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapporteer een Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Broncode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Changelog"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contacteer"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecteer Alles"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Toon QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
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
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Er zijn momenteel geen bridges beschikbaar. "
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Stap %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Stap %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Verkrijg %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Stap %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
@@ -126,27 +141,27 @@ msgstr "Voeg nu %s de bridges toe aan de Tor Browser %s."
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sG%seef me gewoon bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Geavanceerde Opties"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nee"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -154,69 +169,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Hier zijn uw bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Welkom bij BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Huidige ondersteunde transporttype's:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hallo, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo, vriend!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Deze e-mail werd gegenereerd met regenbogen, eenhoorns, en glitters\nvoor %s op %s in %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -227,7 +210,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -239,7 +222,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -248,134 +231,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Wat zijn bridges?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ik heb een alternatieve route nodig om bridges te verkrijgen!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Mijn bridges werken niet! Ik heb hulp nodig!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Hier zijn uw bridge lines:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Verkrijg Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Geen"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Gelieve opties te selecteren voor bridge type:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Heeft u IPv6 adressen nodig?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Heeft u een %s nodig?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Uw browser geeft afbeeldingen niet correct weer."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Voer de karakters van de afbeelding hierboven in..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Hoe beginnen met bridges te gebruiken"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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: "
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Blokkeert of censureert uw internetleverancier (ISP) connecties naar het Tor netwerk?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Vraag standaard bridges aan."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Vraag IPv6 bridges aan."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Vraag Pluggable Transport by TYPE aan."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Verkijg een kopie van de BridgeDB's public GnuPG key."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po
index 76d5ac2..7e5bff4 100644
--- a/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/nn/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Bjørn I., 2014-2015
@@ -9,116 +9,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2017-09-19 19:57+0000\n"
-"Last-Translator: Finn Brudal <finnbrudal@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Norwegian Nynorsk (http://www.transifex.com/otf/torproject/language/nn/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: nn\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Orsak! Noko gjekk gale med førespurnaden din."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Språk"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapporter feil"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kjeldekode"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Endringslogg"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Vel alle"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Vis QR-kode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-for brulinjene dine"
-#. 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 "Ojsann!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Det oppstod ein feil under henting av QR-koden din."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Denne QR-koden inneheld brulinjene dine. Skann han med ein QR-lesar for å kopiera brulinjene dine over på mobilen og andre einingar."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ingen bruer er for tida tilgjengelege "
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Kanskje du skulle freista å %s gå tilbake %s og velja ei anna brutype!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Steg %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Last ned %s Tor-nettlesaren %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Steg %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Hent %s bruer %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Steg %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "No kan du %s leggja til bruene i Tor Browser %s"
@@ -127,27 +142,27 @@ msgstr "No kan du %s leggja til bruene i Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%serre gje meg nokre bruer!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Avanserte innstillingar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nei"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ingen"
#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
#. beginning of words are present in your final translation. Thanks!
#. TRANSLATORS: Translate "Yes!" as in "Yes! I do need IPv6 addresses."
-#: bridgedb/https/templates/options.html:124
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -155,69 +170,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%snyt til bruer"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Dette er ei automatisk melding; gjer vel og ikkje svar.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Her er bruene dine:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Du har gått over fartsavgrensinga. Ver snill og ta det med ro! Minste tillaten tid mellom e-postar er %s timar. E-postar utover dette vert ignorerte."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMMANDOar: (kombiner KOMMANDOar for å spesifisera fleire val samstundes)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Velkomen til BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Gjeldande støtta transport-TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hei, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hallo, ven!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Offentlege nøklar"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Denne e-posten vart laga med regnbogar, einhyrningar og gnistar\nfor %s på %s på %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,7 +211,7 @@ msgid ""
msgstr "BridgeDB kan forsyna bruer med fleire %sslags Pluggbare Transportar%s,\nnoko som kan hjelpa til med å tildekkje koplingane dine åt Tor-nettverket, og\ngjera det vanskelegare for nokon som yvervakar internett-trafikken din å avgjere\nat du nyttar Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -240,7 +223,7 @@ msgstr "Nokre broer med IPv6-adressor er òg åtgjengelege, sjølv um nokre 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -249,134 +232,169 @@ msgid ""
"\n"
msgstr "I tillegg hev BridgeDB mange vanlege bruer %s utan nokon Pluggbare\nTransportar %s, noko som kanskje ikkje høyrast så kult ut, men dei kan framleis\nhjelpa med å koma utanum internettsensur i mange døme.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kva er bruer?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bruer %s er Tor-relé som hjelper deg med å koma utanum sensur."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Eg treng ein alternativ måte å få bruer på!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Eit anna vis å fenge bruer på er å sende ein e-post åt %s. Ver venleg og merk at du\nlyt sende e-posten ved hjelp av ei adressa frå ein av dei fylgjande\ne-poståtbjodarane: %s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Brua mi verkar ikkje! Eg treng hjelp!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Om Tor ikkje fungerer, skriv ein e-post til %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Freist å taka med so mange upplysingar um saka di som du kan, medrekna\nlista yver bruer og Pluggbare Transportar du freista å nytta, Tor-nettlesarversjonen\ndin og alle meldinger som Tor gav ut, osv."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Her er bru-linene dine:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "FÃ¥ bruer!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ver venleg og gjer val for brutype:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Treng du IPv6-adresser?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Treng du %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Nettlesaren din viser ikkje bilete skikeleg."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Skriv inn teikn frå biletet nedanfor "
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Korleis starta å bruka bruer"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "For å leggja bruer inn i Tor-nettlesaren, gakk fyst åt %s Tor-nettlesarnedlastings-\nsida %s og fylg deretter rettleiingane der for å lasta ned og starta Tor-nettlesaren."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Når 'Tor-nettverksinnstillingar'-dialogen kjem upp, klikk på 'Set upp' og fylg\nvegvisaren inntil han spør:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Blokkerer internett-tenesteåtbjodaren (ISP) din eller sensurerer han på anna vis\ntilkoplingar åt Tor-nettverket?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Vel 'Ja' og klikk deretter 'Neste'. For å setja upp dei nye bruene dine, kopier og\nlim brulinene inn i tekstfeltet. Klikk åt slutt 'Kopla til', og du burde vere klår! Um du\nupplever vanskar, freist å klikka på 'Hjelp'-knappen i 'Tor-nettverksinnstillingar'-\nvegvisaren for meir hjelp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Viser denne meldinga."
-
-#. 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 "Be om bruer med fabrikkoppsett."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Be om IPv6-bruer."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Be um ein Pluggbar Transport ved hjelp av TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Feng ein kopi av BridgeDBs offentlege GnuPG-lykel."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..92b5d4e
--- /dev/null
+++ b/bridgedb/i18n/pa/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,402 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# A S Alam <alam.yellow@xxxxxxxxx>, 2014
+# Gursharnjit Singh <gursharnjitsingh13@xxxxxxxxx>, 2019-2020
+# KAMALJEET SINGH, 2018
+# SONIA SINGLA <soniasingla.1812@xxxxxxxxx>, 2018
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 2.8.0\n"
+"Language: pa\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "ਮਾਫ਼ �ਰਨਾ, ਤ�ਹਾਡ� ਬ�ਨਤ� ਵਿੱ� ��� ��ਬ� ਹ��।"
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "à¨à¨¾à¨¸à¨¼à¨¾"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "ਬੱ� ਦ� ਰਿਪ�ਰ� �ਰ�"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "ਸਰ�ਤ ��ਡ"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "ਲਾ� ਬਦਲ�"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "ਸਾਰ� ��ਣ�"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR ��ਡ ਦਿ�ਾ�"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR ��ਡ ਤ�ਹਾਡ� ਪ�ੱਲ ਲਾ�ਨ� ਲ�"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "��ਿਹਾ ਲ�ਦਾ ਹ� �ਿ ਤ�ਹਾਡ� QRcode ਨ�ੰ ਪ�ਰਾਪਤ �ਰਨ ਵਿੱ� �ੱ� ਤਰ�ੱ�� ਹ�� ਸ�"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+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/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "�ਸ ਵ�ਲ� ��� ਵ� ਪ�ਲ �ਪਲਬੱਧ ਨਹ�� ਹ� ..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "ਸ਼ਾ�ਦ ਤ�ਹਾਨ�ੰ %s ਵਾਪਸ �ਾ %s ��ਸ਼ਿਸ਼ �ਰਨ� ਪਵ��� �ਤ� �ੱ� ਵੱ�ਰ� ਪ�ਲ ਦ� �ਿਸਮ ਦ� ��ਣ �ਰ�!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "�ਦਮ %s 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "ਡਾ�ਨਲ�ਡ %s ��ਰ ਬ�ਰਾ��ਰ %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "�ਦਮ %s 2%s"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "ਪ�ਲ %s ਲਵ� %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "�ਦਮ %s 3 %s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, 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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "ਨਹ��"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr ""
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "ਪ�ਲ �� ਹਨ?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "�ਾਲ�"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
index 50acee4..883dac6 100644
--- a/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pl/LC_MESSAGES/bridgedb.po
@@ -1,132 +1,150 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Aron <aron.plotnikowski@xxxxxxxxxxxxx>, 2014
# Aron <aron.plotnikowski@xxxxxxxxxxxxx>, 2013
# JerBen <ayurveda63@xxxxxxxxx>, 2012
+# Bartosz Duszel <bartosz.duszel@xxxxxxxxxxxxxx>, 2020
# bogdrozd <bog.d@xxxxxxxxx>, 2013
# Dawid Job <hoek@xxxxxxx>, 2014
# Rikson <Ers@xxxxxxxxxxxx>, 2014
# Karol Obartuch <kobartuch@xxxxxxx>, 2015
+# Konrad Wila <360kon@xxxxxxxxx>, 2019
# Krzysztof Å?ojowski <maxxxrally@xxxxxxxxx>, 2014
# oirpos <kuba2707@xxxxxxxxx>, 2015
# sebx, 2014-2015
+# Waldemar Stoczkowski, 2020
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: pl\n"
"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Przepraszamy! Ale coÅ? poszÅ?o nie tak z Twoim zapytaniem."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "JÄ?zyk"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "ZgÅ?oÅ? BÅ?Ä?d"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kod źródÅ?owy"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Lista zmian"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Zaznacz wszystko"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Pokaż KodQR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
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
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Aktualnie nie ma dostÄ?pnych żadnych mostów..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Krok %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Krok %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Pobierz %s mostki %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Krok %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Teraz %s dodaj mosty do Tor Browser %s"
@@ -135,27 +153,27 @@ msgstr "Teraz %s dodaj mosty do Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sP%so prostu daj mi mosty!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opcje zaawansowane"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nie"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sT%sak!"
@@ -163,69 +181,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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Ä?.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[To jest automatyczny e-mail.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Oto Twoje mostki:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Witamy w BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Obecnie obsÅ?ugiwane transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Witaj, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Witaj przyjacielu!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ten email zastaÅ? wygenerowany przez tÄ?cze, jednorożce i gwiazdki \ndla %s w %s o %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -236,7 +222,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -248,7 +234,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -257,134 +243,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Czym sÄ? mostki?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "PotrzebujÄ? alternatywnego sposobu na pozyskanie mostków!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Moje mostki nie dziaÅ?ajÄ?! PotrzebujÄ? pomocy!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Jeżeli Twoja przeglÄ?darka Tor nie może siÄ? poÅ?Ä?czyÄ?, spróbuj %s oraz %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Oto Twoje poÅ?Ä?czenia z wykorzystaniem mostów:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "ZdobÄ?dź Mosty!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mechanizmy dystrybucji Bridge"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementuje cztery mechanizmy dystrybucji mostów: \"HTTPS\", \"Moat\",\n\"Email\" oraz \"Zarezerwowane\". Mosty, które nie sÄ? dystrybuowane przez BridgeDB używajÄ?\npseudo-mechanizm \"None\". Poniższa lista skrótowo opisuje jak\ndziaÅ?ajÄ? te poszczególne mechanizmy oraz nasze %s metryki BridgeDB %s pokazujÄ? jak popularny jest\ndany mechanizm."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Zarezerwowane"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Brak"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "ProszÄ? wybraÄ? opcje dla typu mostu:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Czy potrzebujesz adresów IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Czy potrzebujesz %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Twoja przeglÄ?darka nie wyÅ?wietla obrazów prawidÅ?owo."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Wprowadź tekst z obrazka powyżej..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Jak zaczÄ?Ä? używaÄ? mostów"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Aby wprowadziÄ? mosty do Tor Browser, postÄ?puj zgodnie z instrukcjami na %s stronie \npobierania Tor Browser %s, aby uruchomiÄ? Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Czy Twój dostawca usÅ?ug internetowych (ISP) blokuje lub cenzuruje poÅ?Ä?czenia do sieci Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "PoproÅ? o regularne mosty."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "PoproÅ? o mosty IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "PoproÅ? o Pluggable Transport przez TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Uzyskaj kopiÄ? klucza publicznego GnuPG BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
index 1ef7385..b4ac03c 100644
--- a/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt_BR/LC_MESSAGES/bridgedb.po
@@ -1,140 +1,158 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
-# Communia <ameaneantie@xxxxxxxxxx>, 2013-2017
+# Communia <ameaneantie@xxxxxxxxxx>, 2013-2017,2020
# André Almeida <andrefalmeida@xxxxxxxxxxxxxx>, 2018
# anominino anomino <anominino@xxxxxxxxxx>, 2018
+# C. E., 2020
# Cláudio Carvalho <znnb@xxxxxxxx>, 2018
# Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>, 2019
# Danton Medrado, 2015
+# Eduardo Addad de Oliveira <eduardoaddad@xxxxxxxxxxx>, 2019-2020
# Eduardo Bonsi, 2015,2018
# Eduardo Loeffel Noce Gobi <eduardogobi@xxxxxxxxxxx>, 2016-2017
# Augustine <evandro@xxxxxxxxxxxxx>, 2013
# Humberto Sartini, 2014
+# Igor Bk 13 <igorgcoleto@xxxxxxxxx>, 2020
# Isabel Ferreira, 2014
# jhqpinto <jhqpinto@xxxxxxxxxxx>, 2018
# João Paulo S.S <contato1908@xxxxxxxxx>, 2015
# Kaio Soares Rauta <kaio_soares_rauta@xxxxxxxxxxxx>, 2015
# Luciana Dark Blue <lucianadarkblue@xxxxxxxxx>, 2015
+# m tk, 2019
# m4lqu1570 <>, 2012
# Rodrigo Emmanuel Santana Borges <rodrigoesborges@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-08-02 18:18+0000\n"
-"Last-Translator: Cy Belle <cyb3ll3@xxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-16 14:42+0000\n"
+"Last-Translator: Igor Bk 13 <igorgcoleto@xxxxxxxxx>\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"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: pt_BR\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Algo errado ocorreu com a sua solicitação."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Relatar um Bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código Fonte:"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Registro de alterações"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contato"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecionar tudo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para as suas pontes de conexão"
-#. 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 "Ai, caramba!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Parece que houve um erro ao obter o seu Código QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 Código QR contém as suas pontes de conexão. Escaneie com um leitor de Código QR para copiar as pontes de conexão para dispositivos móveis e outros aparelhos."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB encontrou um erro."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Atualmente não há nenhuma ponte disponÃvel..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Talvez você deva tentar %s voltar %s e escolher um outro tipo de ponte!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Passo %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Fazer download do %s Navegador Tor %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Passo %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter %s pontes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Passo %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
@@ -143,27 +161,27 @@ msgstr "Agora, %s inserir as pontes no Navegador Tor %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sA%spenas me dê pontes!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opções Avançadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Não"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "nenhum"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sim!"
@@ -171,69 +189,37 @@ msgstr "%sS%sim!"
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sObter%s Bridges"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Esta é uma mensagem automática; por favor, não responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Este é um email automático.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Aqui estão suas pontes:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Você excedeu o quantidade limite. Mais devagar, por favor! O tempo mÃnimo entre\ne-mails é de %s horas. Todos os outros e-mails serão ignorados durante este perÃodo."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOS: (combine COMANDOS para especificar múltiplas opções simultaneamente)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bem vindo ao BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOS de transporte compatÃveis no momento:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Olá, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Olá, amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Chaves Públicas"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Este e-mail foi gerado com arco-Ãris, unicórnios e brilho, para %s, em %s, à s %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Se essas pontes não são o que você precisa, responda para este email com um dos\nseguintes comandos no corpo da mensagem:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -244,7 +230,7 @@ msgid ""
msgstr "BridgeDB pode fornecer pontes com vários %stipos de Transportadores Plugáveis%s,\nque podem ajudar a ocultar as suas conexões com a rede Tor, tornando mais difÃcil,\npara quem estiver observando o seu tráfego na Internet, saber ao certo se você está usando Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -256,7 +242,7 @@ msgstr "Algumas pontes com endereços IPv6 também estão disponÃveis, embora 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -265,134 +251,169 @@ msgid ""
"\n"
msgstr "Além disso, BridgeDB tem várias pontes simples %s sem quaisquer Transportadores Plugáveis %s, o que talvez não pareça tão legal, mas pode ajudar a driblar a censura na Internet em muitos casos.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "O que são pontes?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Pontes %s são relés Tor que ajudam a driblar a censura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Preciso de um outro modo de obter pontes!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Outro modo de obter pontes é enviando um e-mail para %s. Por favor, lembre que você deve enviar o e-mail utilizando um endereço registrado em um dos seguintes provedores de e-mail: \n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Outra maneira de obter pontes é enviar um email para %s. Deixe o assunto do email\nesvazie e escreva \"get transport obfs4\" no corpo da mensagem do email. Observe\nque você deve enviar o email usando um endereço de um dos seguintes emails\nprovedores: %s ou %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Minhas pontes não funcionam! Preciso de ajuda!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o Tor não funcionar, envie um e-mail %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir o máximo de informações possÃveis sobre o seu caso, junto com a lista de \npontes e Transportadores Plugáveis que você tentou utilizar, a versão do seu Navegador Tor\ne toda mensagem que o Tor tenha dado, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Se o seu navegador Tor não se conectar, consulte %se %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Aqui estão as suas pontes de conexão:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Obtenha Pontes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribuição de pontes"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementa quatro mecanismos para distribuir pontes: \"HTTPS\", \"Moat\", \"Email\", \"Reservado\". Pontes que não são distribuÃdas por BridgeDB usam o pseudomecanismo \"Nenhum\". A lista seguinte explica resumidamente como estes mecanismos funcionam e o nosso %s métricas BridgeDB %s visualize quão popular é cada um dos mecanismos."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "O mecanismo de distribuição \"HTTPS\" distribui pontes sobre este site. Para obter pontes, vá para %s bridges.torproject.org%s, selecione suas opções preferidas e resolva o CAPTCHA subsequente."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "O mecanismo de distribuição \"Moat\" é parte do Navegador Tor, permitindo usuários requisitarem pontes de dentro das configurações do Navegador Tor deles. Para obter pontes, vá para as %s configuarações Tor%s do seu Navegador Tor, clique em \"requisitar uma nova ponte\", resolva o CAPTCHA subsequente e o Navegador Tor irá automaticamente adicionar suas novas pontes."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Usuários podem requisitar pontes através do mecanismo de distribuição \"Email\" ao enviar um email para %s bridges@xxxxxxxxxxxxxx%s e escrevendo \"get transport obfs4\" no corpo do email."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB mantém um pequeno número de pontes que não são distribuÃdas automaticamente. Ao invés, nós reservamos estas pontes para distribuição manual e as distribuÃmos para ONGs e outras organizações individuais que necessitam de pontes. Pontes que são distribuÃdas através do mecanismo \"Reservado\" podem não ser usadas com tanta frequência. Observe que o mecanismo de distribuição \"Reservado\" é chamado de \"Não alocado\" nos arquivos %sbridge pool assignment%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nenhum"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Pontes as quais o mecanismo de distribuição é \"Nenhum\" não são distribuÃdas por BridgeDB.\nÃ? responsabilidade do operador da ponte distribuir suas pontes para os \n\nusuários. Observe que, na Pesquisa de retransmissão, a distribuição de uma ponte recém-configurada\nmecanismo diz \"Nenhum\" por até aproximadamente um dia. Por favor, seja paciente e\nele mudará para o mecanismo de distribuição atual da ponte.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Por favor, selecione as opções de tipos de pontes:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Você precisa de endereços IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Você precisa de %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Seu navegador não está mostrando as imagens corretamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Digite os caracteres da imagem acima..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Como começar a usar as suas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Para adicionar pontes ao Navegador Tor, primeiro vá ao %s página de download\ndo Navegador Tor %s e siga as instruções para fazer o download e iniciá-lo."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Primeiro você precisa %sbaixar o Navegador Tor%s. Nosso manual do usuário\n do Navegador Tor explica como você pode adicionar pontes para o Navegador Tor. Se você estiver\n usando Windows, Linux ou macOS, %sclique aqui%s para aprender mais. Se você\n estiver usando Android, %sclique aqui%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Quando a janela 'Configurações da Rede Tor' aparecer, clique em 'Configurar' e siga\no assistente até que ele pergunte:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Adicione estas pontes para o seu Navegador Tor abrindo o as preferências do \nseu navegador, clicando em \"Tor\" e então adicionando elas no campo \n\"Forneça uma ponte\"."
-#. 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 "O seu Provedor de Serviços de Internet (PSI) bloqueia ou censura conexões\nà rede Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicitar pontes não ofuscadas do Tor "
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecione 'Sim' e clique em 'Próximo'. Para configurar as suas novas pontes, copie e cole as pontes de conexão na caixa de entrada de texto. Em seguida, clique em 'Conectar' e tudo deverá estar pronto! Caso haja problemas, clique no botão 'Ajuda' do assistente de 'Configurações da Rede Tor' para mais suporte."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Mostrar essa mensagem."
-
-#. 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 "Solicitar pontes simples."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicitar pontes IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicitar um Transportador Plugável por TIPO."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Solicitar pontes IPv6.)"
-#. 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 "Obter uma cópia da chave pública GnuPG do BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Solicitar pontes obfs4 ofuscadas.)"
diff --git a/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po
index e42ec77..b760cc5 100644
--- a/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/pt_PT/LC_MESSAGES/bridgedb.po
@@ -1,10 +1,11 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# A Russo <quisquiliarum2001-habitica@xxxxxxxxxxx>, 2019
+# Hugo9191 <hugoncosta@xxxxxxxxx>, 2019-2020
+# Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2019-2020
# Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2018
# Manuela Silva <manuelarodsilva@xxxxxxxxx>, 2019
# Nuno Rego <nuno.rego@xxxxxxxxxxx>, 2019
@@ -13,116 +14,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-08-11 10:53+0000\n"
-"Last-Translator: Nuno Rego <nuno.rego@xxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Portuguese (Portugal) (http://www.transifex.com/otf/torproject/language/pt_PT/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: pt_PT\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Desculpe! Ocorreu algo de errado com o seu pedido."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Idioma"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Comunicar um Erro"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Código Fonte"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
-msgstr "Registo de alterações"
+msgstr "Registo de Alterações"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contactar"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selecionar Tudo"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Mostrar Código QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Código QR para as suas linhas de ponte"
-#. 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 "Ocorreu um erro!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Parece que ocorreu um erro ao obter o seu Código QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 Código QR contém as suas linhas de ponte. Digitalize-as com um leitor de Código QR para copiar as suas linhas de ponte para os dispositivos móveis e outros dispositivos."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Atualmente, não existem pontes disponÃveis..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
-msgstr "Talvez devesse experimentar %s e voltar a %s, escolhendo um tipo de ligação diferente!"
+msgstr "Talvez deva tentar %s e voltar a %s e escolher um tipo de ponte diferente!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Passo %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Transferir %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Passo %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Obter %s pontes %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Passo %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
@@ -131,27 +147,27 @@ msgstr "Agora, %s adicione as pontes ao Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sD%sisponibilizem-me apenas as pontes!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opções Avançadas"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Não"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "nenhum"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sS%sim!"
@@ -159,69 +175,37 @@ msgstr "%sS%sim!"
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbter Pontes"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Esta é uma mensagem automática; por favor, não responda.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Esta é uma mensagem automática.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Aqui estão as suas pontes:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Excedeu a taxa limite. Por favor, abrande! O tempo mÃnimo entre e-mails \né de %s horas. Todos os e-mails enviados nesse perÃodo serão ignorados."
+msgstr "Excedeu a taxa limite. Por favor, abrande! O tempo mÃnimo entre e-mails é \nde %s horas. Todos os e-mails enviados nesse perÃodo serão ignorados."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMANDOS: (combine COMANDOS para especificar múltiplas opções em simultâneo)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bem-vindo ao BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "TIPOS de transporte atualmente suportados:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Olá, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Olá, amigo!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Chaves Públicas"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Esta mensagem foi gerada com arco-Ãris, unicórnios e estrelas\npara %s em %s à s %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Se estas pontes não são o que necessita, responda a este email com um dos\nseguintes comandos no corpo da mensagem:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -229,158 +213,193 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "O BridgeDB pode disponibilizar ligações com vários %stipos de Conexões%s,\nque podem ajudar a ocultar as suas ligações à Rede Tor, tornando mais difÃcil\npara alguém monitorizar o seu tráfego na Internet para determinar se está a utilizar o Tor.\n"
+msgstr "BridgeDB pode disponibilizar pontes com vários %stipos de 'Transportes Ligáveis'%s,\nque podem ajudar a ocultar as suas ligações à Rede Tor, tornando mais difÃcil\npara alguém monitorizar o seu tráfego na Internet para determinar se está a utilizar o Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Também estão disponÃveis algumas ligações com endereços de IPv6, embora\nalgumas conexões não sejam compatÃveis com IPv6.\n\n"
+msgstr "Também estão disponÃveis algumas pontes com endereços de IPv6, embora\nalguns 'Transportes Ligáveis' não são compatÃveis com IPv6.\n\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "Adicionalmente, BridgeDB tem imensas ligações %s simples, normais e regulares,\nsem quaisquer Transportes de Ligação %s, o que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura na Internet, na maioria dos casos.\n"
+msgstr "Adicionalmente, BridgeDB tem imensas pontes %s simples, normais e regulares,\nsem quaisquer 'Transportes Ligáveis' %s que poderá não parecer ótimo, mas estes,\nainda assim, ajudam a contornar a censura da Internet na maioria dos casos.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "O que são pontes?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "As %s Pontes %s são retransmissões Tor que o ajudam a contornar a censura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Eu preciso de um modo alternativo para obter as pontes!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Outra forma de obter pontes, é enviar uma mensagem para %s. Por favor, note que\ndeve enviar a mensagem utilizando um endereço dos seguintes fornecedores de e-mail\n%s, %s ou %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Outra forma de obter pontes, é enviar um ''e-mail'' para %s. Deixe o assunto da mensagem\nem branco e escreva \"get transport obfs4\" no corpo da mesma. Por favor, note que deve enviar \na mensagem utilizando um endereço dos seguintes provedores de ''e-mail'':\n%s ou %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "As minhas pontes não funcionam! Eu preciso de ajuda!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Se o seu Tor não funciona, deve enviar uma mensagem para %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Tente incluir o máximo de informação possÃvel sobre o seu caso, incluindo a lista\nde ligações e Pluggable Transports que tentou utilizar, a versão do seu Tor Browser e \nquaisquer mensagens que o Tor devolveu, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Se o seu Tor Browser não consegue ligar, por favor, consulte %s e o nosso %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Aqui estão as suas linhas de ponte:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Obter Pontes!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanismos de distribuição de Ponte"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "A BridgeDB implementa 4 mecanismos para distribuir pontes: \"HTTPS\", \"Moat\",\n\"Email\" e \"Reserved\". As pontes que não são distribuÃdas através do BridgeDB usam\no pseudo-mecanismo \"None\". A seguinte lista explica rapidamente como é que estes\nmechanisms funcionam e as nossas %smétricas BridgeDB%s visualizam quão popular cada um dos\nmecanismos é."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "O mecanismo de distribuição \"HTTPS\" distribui pontes através deste website. Para obter\npontes, vá a %sbridges.torproject.org%s, seleciona as opções e\nresolva o CAPTCHA subsequente."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "O mecanismo de distribuição \"Moat\" é parte do Tor Browser, permitindo aos utilizadores\npedir pontes através das definições do Tor Browser. Para obter pontes, vá à s\n%sTor settings%s do seu Tor Browser, clique em \"pedir uma nova ponte\", resolva o CAPTCHA subsequente e o Tor Browser automaticamente adicionará as suas novas\npontes."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Utilizadores podem pedir pontes através do mecanismo de distribuição \"Email\" enviando um\nemail para %sbridges@xxxxxxxxxxxxxx%s e escrevendo \"get transport obfs4\" no\ncorpo do email."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reservado"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "A BridgeDB mantem um pequeno número de pontes que não são distribuÃdas\nautomaticamente. Em vez disso, reservamos essas pontas para distribuição manual e\nenviamos a ONGs e outras organizações ou indivÃduos que precisem de\npontes. As pontes distribuÃdas através do mecanismo \"Reserved\" podem não\nver utilizadores por muito tempo. Note que o mecanismo de distribuição \"Reserved\" é\nchamado de \"Unallocated\" nos ficheiros de %sassignação de pontes%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nenhum"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Pontes cujo mecanismo de distribuição seja \"None\" não são distribuÃdas pelo BridgeDB.\nÃ? a responsabilidade do operador da ponte distribuir as suas pontes aos\nutilizadores. Note que em Relay Search, o mecanismo de distribuição de uma ponte \ndiz \"None\" por aproximadamente um dia. Tenha um pouco de paciência e\nirá mudar para o correto mecanismo de distribuição da ponte.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Por favor, selecione as opções para o tipo de ponte:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Precisa de endereços de IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Precisa de %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "O seu navegador não está a exibir as imagens devidamente."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Insira os carateres da imagem acima..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Como começar a utilizar as suas pontes"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Para inserir as ligações no Tor Browser, aceda primeiro à página %s para transferir o Tor Browser %s\ne depois siga as instruções sobre com transferir e utilizar o\nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Primeiro, tem de %sdescarregar o Tor Browser%s. O nosso Manual do Utilizador \n do Tor Browser explica como pode adicionar pontes ao Tor Browser. Se estiver a utilizar\n Windows, Linux ou OS X, %sclique aqui%s para aprender mais. Se estiver\n a usar Android, %sclique aqui%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Assim que aparecer a janela de 'Configurações da Rede Tor' clique em 'Configurar' e siga\nas instruções do assistente até que lhe pergunte:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Adicione estas pontes ao seu Tor Browser abrindo as preferências do \nseu navegador, clicando em \"Tor\" e daà adicioná-las ao campo \"Providenciar uma\nponte\"."
-#. 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 "O seu fornecedor de acesso à Internet (ISP) bloqueia ou censura as ligações\nà rede Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Solicitar pontes Tor não ofuscadas.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Selecione 'Sim' e depois clique em 'Seguinte'. Para configurar as suas novas conexões, copie e\ncole as linhas de ponte na caixa de texto. Finalmente, clique em 'Ligar' e\ndeverá estar pronto para continuar! Se encontrar problemas, tente clicar na 'Ajuda' no\nassistente de 'Configurações da Rede Tor' para mais assistência."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Exibe esta mensagem."
-
-#. 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 "Solicite as pontes básicas."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Solicite as pontes de IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Solicite um Transporte de Ligação por TIPO."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Pedir pontes IPv6.)"
-#. 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 "Obtenha uma cópia da chave pública GnuPG da BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Pedir pontes obfs4 ofuscadas.)"
diff --git a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
index 599051c..6cbc42f 100644
--- a/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ro/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# A C <ana@xxxxxxxxxxxx>, 2019
@@ -9,123 +9,140 @@
# Ana <ana_maria_js@xxxxxxxxx>, 2015
# axel_89, 2015
# Di N., 2015
+# eduard pintilie <eduard.pintilie@xxxxxxxxx>, 2019-2020
# Isus Satanescu <inactive+isus@xxxxxxxxxxxxx>, 2014
# laura berindei <lauraagavriloae@xxxxxxxxx>, 2014
+# polearnik <polearnik@xxxxxxx>, 2019
# clopotel <yo_sergiu05@xxxxxxxxx>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-08 20:34+0000\n"
-"Last-Translator: A C <ana@xxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ro\n"
"Plural-Forms: nplurals=3; plural=(n==1?0:(((n%100>19)||((n%100==0)&&(n!=0)))?2:1));\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Scuze ! Ceva n-a mers cum trebuie!"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "LimbÄ?"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "RaporteazÄ? un bug"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Cod sursÄ?"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "SchimbÄ?ri"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Contact"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Selectare totalÄ?"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "AratÄ? QRcod-ul"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Cod QR pentru punÈ?ile tale"
-#. 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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Se pare cÄ? s-a produs o eroare în obÈ?inerea codului QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 punÈ?ile tale. 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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Pe moment nu existÄ? punÈ?i disponibile..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Poate ar trebui sÄ? %s mergi înapoi %s È?i sÄ? alegi un alt tip de punte!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Pasul %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Pasul %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "ObÈ?ine %s punÈ?i %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Pasul %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Acum %s adaugÄ? punÈ?ile în Tor Browser %s"
@@ -134,27 +151,27 @@ msgstr "Acum %s adaugÄ? punÈ?ile în Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sD%soar dÄ?-mi punÈ?ile odatÄ?!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "OpÈ?iuni avansate"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nu"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sD%sa!"
@@ -162,69 +179,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sO%sbÈ?ine Bridges"
-#: 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.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Acesta este un e-mail trimis automat.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Acestea sunt punÈ?ile tale:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
-#: 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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Bine ai venit la BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPE-uri suportate momentan:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "BunÄ? , %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "BunÄ?, prietene!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Acest e-mail a fost generat cu inorogi, curcubee È?i scântei \npentru %s în %s la %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "DacÄ? aceste punÈ?i nu sunt cele necesare, rÄ?spundeÈ?i la acest e-mail cu una dintre\nurmÄ?toarele comenzi în corpul mesajului:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,7 +220,7 @@ msgid ""
msgstr "BridgeDB poate oferi punÈ?i cu diferite tipuri de %sPluggable Transports %s,\nce pot ascunde conexiunile tale cÄ?tre Tor Network, fÄ?când mai dificil \nde observat cÄ? foloseÈ?ti Tor\npentru cine îÈ?i urmÄ?reÈ?te traficul de Internet.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -247,7 +232,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -256,134 +241,169 @@ msgid ""
"\n"
msgstr "Ã?n plus, BridgeDB are multe punÈ?i simple %s fÄ?rÄ? niciun\nTransport Conectabil %s ce poate nu par aÈ?a cool, dar care pot\ntotuÈ?i sÄ? ajute la evitarea cenzurii Internetului în multe cazuri.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ce sunt punÈ?ile? "
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s PunÈ?ile %s sunt releuri Tor care te ajutÄ? sÄ? eviÈ?i cenzura."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Am nevoie de o cale alternativÄ? de a obÈ?ine punÈ?ile!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "O altÄ? cale pentru a obÈ?ine 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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Un alt mod de a obÈ?ine punÈ?i este sÄ? trimiteÈ?i un e-mail cÄ?tre %s. LÄ?saÈ?i subiectul de e-mail\ngol È?i scrieÈ?i \"get transport obfs4\" în corpul de e-mail. VÄ? rugÄ?m sÄ? reÈ?ineÈ?i\ncÄ? trebuie sÄ? trimiteÈ?i e-mailul utilizând o adresÄ? de la unul dintre furnizorii de e-mail: %s sau %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
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".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "DacÄ? Tor nu funcÅ£ioneazÄ? pentru tine, 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".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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Ä? incluzi cât mai multe informaÈ?ii despre cazul tÄ?u pe cât posibil, include lista de \npunÈ?i È?i Pluggable Transports pe care ai încercat sÄ? le foloseÅ?ti, versiunea de navigator Tor Browser\nÈ?i orice alt mesaj dat de Tor, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "DacÄ? Tor Browser nu se poate conecta, vÄ? rugÄ?m sÄ? aruncaÈ?i o privire la %s È?i %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Acestea sunt liniile tale de punÈ?i:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "ObÈ?ine punÈ?i!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Mecanisme de distribuÈ?ie a punÈ?ii"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementeazÄ? patru mecanisme de distribuire a punÈ?ilor: \"HTTPS\", \"Moat\",\n\"Email\" È?i \"Reserved\". PunÈ?ile care nu sunt distribuite prin BridgeDB folosesc\npseudo-mecanismul \"None\". UrmÄ?toarea listÄ? explicÄ? pe scurt cum funcÈ?ioneazÄ? acestea\nÈ?i cum se poate vizualiza cu %sBridgeDB metrics%s cât de popular este fiecare \nmecanism."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Mecanismul de distribuÈ?ie â??HTTPSâ?? transmite punÈ?i peste acest site web. Pentru a obÈ?ine\npunÈ?i, accesaÈ?i %sbridges.torproject.org%s, selectaÈ?i opÈ?iunile pe care le preferaÈ?i È?i\nrezolvaÈ?i testul CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Mecanismul de distribuire \"Moat\" face parte din Tor Browser, permiÈ?ând utilizatorilor sÄ?\nsolicite punÈ?i din setÄ?rile Tor Browser. Pentru a obÈ?ine punÈ?i, accesaÈ?i\nsetÄ?rile Tor Browser %sTor settings%s, clic pe \"request a new bridge\", rezolvaÈ?i\ntestul CAPTCHA È?i Tor Browser va adÄ?uga automat noile\npunÈ?i."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Utilizatorii pot solicita punÈ?i de la mecanismul de distribuÈ?ie â??Emailâ?? prin trimiterea unui\nemail la %sbridges@xxxxxxxxxxxxxx%s È?i scriind \"get transport obfs4\" în\ncorpul email-ului."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Rezervat"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB menÈ?ine un numÄ?r mic de punÈ?i care nu sunt distribuite\nautomat. Ã?n schimb, rezervÄ?m aceste punÈ?i pentru distribuirea manualÄ? È?i\nle înmânÄ?m unor ONG-uri È?i unor organizaÈ?ii È?i persoane fizice care au nevoie\nde punÈ?i. PunÈ?ile care sunt distribuite prin mecanismul \"Reserved\" ar putea sÄ? nu \nvadÄ? utilizatorii pe o perioadÄ? mai mare de timp. ReÈ?ineÈ?i cÄ? mecanismul de distribuire \"Reserved\" este\nnumit \"Unallocated\" în fiÈ?ierele %sbridge pool assignment%s."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Nimic"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "PunÈ?ile al cÄ?ror mecanism de distribuÈ?ie este â??Noneâ?? nu sunt distribuite de BridgeDB.\nEste responsabilitatea operatorului de punÈ?i sÄ? distribuie punÈ?ile lor cÄ?tre\nutilizatori. ReÈ?ineÈ?i cÄ? la cÄ?utarea cu releu, distribuÈ?ia unei punÈ?i proaspÄ?t configurate\nmecanismul rÄ?spunde cu \"None\" timp de aproximativ o zi. AveÈ?i rÄ?bdare, pentru cÄ?\nse va schimba apoi la mecanismul de distribuÈ?ie propriu-zis al punÈ?ii.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Alege opÈ?iunile pentru tipul de punte:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ai nevoie de adrese IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ai nevoie de %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Browserul nu afiÈ?eazÄ? imaginile corect."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Introdu caracterele din imaginea de mai sus..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Cum sÄ? începi sÄ? foloseÅ?ti punÈ?ile"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Pentru a introduce punÈ?i în Tor Browser, mai întâi mergi la %s pagina de descÄ?rcare Tor Browser\n%s È?i apoi urmeazÄ? instrucÈ?iunile de descÄ?rcare È?i iniÈ?ializare\na Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Mai întâi, trebuie sÄ? %sdescÄ?rcaÈ?i Tor Browser%s. Manualul Tor Browser User\nexplicÄ? cum puteÈ?i adÄ?uga punÈ?i la Tor Browser. DacÄ?\n folosiÈ?i Windows, Linux sau OS X, %sclic aici%s pentru a afla mai multe. DacÄ?\n folosiÈ?i Android, %sclic aici%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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Ä? 'Configurare' È?i urmeazÄ? \nindicaÈ?iile programului pânÄ? când va cere:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "AdÄ?ugaÈ?i aceste punÈ?i la Tor Browser deschizând \npreferinÈ?ele pentru browserul, faceÈ?i clic pe â??Torâ??, apoi adÄ?ugaÈ?i-le la câmpul â??Provide a\nbridge\"."
-#. 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 "Furnizorul de servicii de Internet (ISP) îÈ?i blocheazÄ? sau cenzureazÄ? conexiunile cÄ?tre reÈ?eaua Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(SolicitÄ? punÈ?i Tor nedisimulate - unobfuscated.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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 lipeÈ?te \npunÈ?ile în cÄ?suÈ?a de text. Ã?n final, selecteazÄ? 'ConecteazÄ?-te' È?i totul e gata! \nDacÄ? ai probleme, apasÄ? butonul 'Ajutor' din 'SetÄ?ri ReÈ?ea Tor'."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Cere punÈ?i simple."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Cere punÈ?i IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "SolicitÄ? un Transport Conectabil dupÄ? TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr "(Cere punÈ?i IPv6.)"
-#. 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 "ObÈ?ine o copie a cheii GnuPG publice a BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Cere punÈ?i obfuscate obfs4.)"
diff --git a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
index f1b1475..ca5d2a9 100644
--- a/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ru/LC_MESSAGES/bridgedb.po
@@ -1,12 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Andrey, 2017
# Andrey Yoker Ogurchikov <domovoy.yoker@xxxxxxxxx>, 2014
# Ð?нÑ?он ТолмаÑ?ев <a.tolmachev@xxxxxxxxxxxxxxxxxx>, 2016
# Denis Denis <stereodenis@xxxxxxxxx>, 2014
+# diana azaryan <dianazryn@xxxxxxxxx>, 2020
# Dmitry Schneider <adamred280@xxxxxxx>, 2019
# Eugene, 2013
# foo <im-infamous@xxxxxxxxx>, 2014
@@ -19,155 +20,172 @@
# Oleg, 2014
# Roberto Brigante, 2017
# Sergey Briskin, 2014
-# Timofey Lisunov <solokot@xxxxxxxxx>, 2018
+# Sergey Smirnov <cj75300@xxxxxxxxx>, 2019-2020
+# solokot <solokot@xxxxxxxxx>, 2019
+# solokot <solokot@xxxxxxxxx>, 2018
# Valid Olov, 2014
# vb[fbk <kisn23@xxxxxxx>, 2015
# Ð?икÑ?оÑ? Ð?Ñ?Ñ?Ñ?ин <rewanh59@xxxxxxxxx>, 2016
# Vitaliy Grishenko, 2014
-# Uho Lot <yavinav@xxxxxxxxx>, 2016
+# Andrey Kostrikov <yavinav@xxxxxxxxx>, 2016
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-05-01 09:18+0000\n"
-"Last-Translator: Dmitry Schneider <adamred280@xxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Russian (http://www.transifex.com/otf/torproject/language/ru/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ru\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?звиниÑ?е! ЧÑ?о-Ñ?о поÑ?ло не Ñ?ак Ñ? ваÑ?им запÑ?оÑ?ом."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "ЯзÑ?к"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "СообÑ?иÑ?Ñ? об оÑ?ибке"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?Ñ?Ñ?однÑ?й код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?Ñ?Ñ?нал изменений"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?онÑ?акÑ?Ñ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ð?Ñ?бÑ?аÑ?Ñ? вÑ?е"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ð?оказаÑ?Ñ? QR-код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+msgstr "QR-код длÑ? адÑ?еÑ?ов моÑ?Ñ?ов"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ð?оÑ?оже, пÑ?оизоÑ?ла оÑ?ибка пÑ?и полÑ?Ñ?ении QR-кода."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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-код, Ñ?Ñ?обÑ? Ñ?копиÑ?оваÑ?Ñ? адÑ?еÑ?а Ñ?еÑ?Ñ?Ñ?анÑ?лÑ?Ñ?оÑ?ов на мобилÑ?нÑ?е и дÑ?Ñ?гие Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва."
+msgstr "ÐÑ?оÑ? QR-код Ñ?одеÑ?жиÑ? адÑ?еÑ?а моÑ?Ñ?ов. Ð?Ñ?полÑ?зÑ?йÑ?е Ñ?канеÑ? QR-кода, Ñ?Ñ?обÑ? Ñ?копиÑ?оваÑ?Ñ? адÑ?еÑ?а моÑ?Ñ?ов на мобилÑ?нÑ?е и дÑ?Ñ?гие Ñ?Ñ?Ñ?Ñ?ойÑ?Ñ?ва."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ð?а даннÑ?й моменÑ? неÑ? доÑ?Ñ?Ñ?пнÑ?Ñ? моÑ?Ñ?ов..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
-msgstr "Ð?озможно, вам Ñ?Ñ?оиÑ? попÑ?обоваÑ?Ñ? %s веÑ?нÑ?Ñ?Ñ?Ñ?Ñ?%s и вÑ?бÑ?аÑ?Ñ? дÑ?Ñ?гой Ñ?ип моÑ?Ñ?а!"
+msgstr "Ð?озможно, вам Ñ?Ñ?оиÑ? попÑ?обоваÑ?Ñ? %s веÑ?нÑ?Ñ?Ñ?Ñ?Ñ? %s и вÑ?бÑ?аÑ?Ñ? дÑ?Ñ?гой Ñ?ип моÑ?Ñ?а!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
-msgstr "Шаг %sâ??1%s"
+msgstr "Шаг %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "СкаÑ?айÑ?е %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
-msgstr "Шаг %sâ??2%s"
+msgstr "Шаг %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
-msgstr "УÑ?Ñ?ановиÑ?е %s моÑ?Ñ?Ñ? %s"
+msgstr "Ð?олÑ?Ñ?иÑ?е адÑ?еÑ?а %s моÑ?Ñ?ов %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
-msgstr "Шаг %sâ??3%s"
+msgstr "Шаг %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Ð?аÑ?ем %s добавÑ?Ñ?е адÑ?еÑ?а моÑ?Ñ?ов в 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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
-msgstr "%sÐ?%sÑ?оÑ?Ñ?о добавÑ?Ñ?е ваÑ? адÑ?еÑ? моÑ?Ñ?а!"
+msgstr "%sÐ?%sÑ?оÑ?Ñ?о дайÑ?е мне адÑ?еÑ?а моÑ?Ñ?ов!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Ð?ополниÑ?елÑ?нÑ?е наÑ?Ñ?Ñ?ойки"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ð?еÑ?"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "оÑ?Ñ?Ñ?Ñ?Ñ?Ñ?вÑ?еÑ?"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sÐ?%sа! "
@@ -175,69 +193,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
-msgstr "%sÐ?олÑ?Ñ?иÑ?Ñ? адÑ?еÑ?а моÑ?Ñ?ов%s"
+msgstr "%sÐ?%sолÑ?Ñ?иÑ?Ñ? адÑ?еÑ?а моÑ?Ñ?ов"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[ÐÑ?о авÑ?омаÑ?иÑ?еÑ?кое Ñ?ообÑ?ение, пожалÑ?йÑ?Ñ?а, не оÑ?веÑ?айÑ?е на него.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[ÐÑ?о авÑ?омаÑ?иÑ?еÑ?кое пиÑ?Ñ?мо.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ð?аÑ?и адÑ?еÑ?а моÑ?Ñ?ов:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 Ñ?аÑ?ов. СообÑ?ениÑ?, оÑ?пÑ?авленнÑ?е до Ñ?Ñ?ого вÑ?емени, бÑ?дÑ?Ñ? пÑ?оигноÑ?иÑ?ованÑ?."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ð?Ð?Ð?Ð?Ð?Ð?Ы: (Ñ?овмеÑ?айÑ?е командÑ?, Ñ?Ñ?обÑ? иÑ?полÑ?зоваÑ?Ñ? неÑ?колÑ?ко Ñ?Ñ?нкÑ?ий одновÑ?еменно)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?обÑ?о пожаловаÑ?Ñ? в BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ТекÑ?Ñ?ий поддеÑ?живаемой Ñ?ип пеÑ?едаÑ?и - TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ðй, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?дÑ?авÑ?Ñ?вÑ?й, дÑ?Ñ?г!"
-
-#: 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."
-#: 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."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ð?Ñ?ли Ñ?Ñ?и моÑ?Ñ?Ñ? не Ñ?о, Ñ?Ñ?о вам нÑ?жно, оÑ?веÑ?Ñ?Ñ?е на Ñ?Ñ?о пиÑ?Ñ?мо\nÑ? помоÑ?Ñ?Ñ? одной из Ñ?ледÑ?Ñ?Ñ?иÑ? команд в Ñ?еле Ñ?ообÑ?ениÑ?:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -245,158 +231,193 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB можеÑ? Ñ?абоÑ?аÑ?Ñ? Ñ? неÑ?колÑ?кими %s Ñ?ипами пеÑ?едаÑ?и даннÑ?Ñ?%s,\nÑ?Ñ?о помогаеÑ? Ñ?низиÑ?Ñ? Ñ?иÑ?к обнаÑ?Ñ?жениÑ? и Ñ?кÑ?Ñ?Ñ?Ñ? ваÑ?е Ñ?оединение Ñ? Tor Network. Ð?лагодаÑ?Ñ? Ñ?Ñ?омÑ? ваÑ? Ñ?Ñ?аÑ?ик в Ñ?еÑ?и Tor оÑ?Ñ?ледиÑ?Ñ? бÑ?деÑ? пÑ?акÑ?иÑ?еÑ?ки невозможно.\n"
+msgstr "BridgeDB можеÑ? Ñ?абоÑ?аÑ?Ñ? Ñ? неÑ?колÑ?кими %s Ñ?ипами подклÑ?Ñ?аемÑ?Ñ? Ñ?Ñ?анÑ?поÑ?Ñ?ов%s,\nÑ?Ñ?о помогаеÑ? Ñ?низиÑ?Ñ? Ñ?иÑ?к обнаÑ?Ñ?жениÑ? и Ñ?кÑ?Ñ?Ñ?Ñ? ваÑ?е Ñ?оединение Ñ? Ñ?еÑ?Ñ?Ñ? Tor. Ð?лагодаÑ?Ñ? Ñ?Ñ?омÑ? ваÑ? Ñ?Ñ?аÑ?ик в Ñ?еÑ?и Tor оÑ?Ñ?ледиÑ?Ñ? бÑ?деÑ? пÑ?акÑ?иÑ?еÑ?ки невозможно.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "СÑ?Ñ?еÑ?Ñ?вÑ?Ñ?Ñ? моÑ?Ñ?Ñ?, поддеÑ?живаÑ?Ñ?ие Ñ?абоÑ?Ñ? Ñ? адÑ?еÑ?ами IPv6, но в болÑ?Ñ?инÑ?Ñ?ве Ñ?лÑ?Ñ?аев пеÑ?едаÑ?а даннÑ?Ñ? по адÑ?еÑ?ам IPv6 не поддеÑ?живаеÑ?Ñ?Ñ?.\n"
+msgstr "Ð?екоÑ?оÑ?Ñ?е моÑ?Ñ?Ñ? поддеÑ?живаÑ?Ñ? Ñ?акже IPv6, но некоÑ?оÑ?Ñ?е подклÑ?Ñ?аемÑ?е Ñ?Ñ?анÑ?поÑ?Ñ?Ñ? не Ñ?овмеÑ?Ñ?имÑ? Ñ? IPv6.\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "Ð?олее Ñ?ого, BridgeDB Ñ?одеÑ?жиÑ? множеÑ?Ñ?во Ñ?Ñ?андаÑ?Ñ?нÑ?Ñ? моÑ?Ñ?ов %s, не поддеÑ?живаÑ?Ñ?ий пеÑ?едаÑ?Ñ? даннÑ?Ñ? %s, Ñ?Ñ?о можеÑ? повлиÑ?Ñ?Ñ? на оÑ?обÑ?ажение Ñ?Ñ?Ñ?аниÑ?Ñ? Ñ?айÑ?а, Ñ?ак-же они во многиÑ? Ñ?лÑ?Ñ?аÑ?Ñ?, помогаÑ?Ñ? обойÑ?и инÑ?еÑ?неÑ?-Ñ?ензÑ?Ñ?Ñ?.\n"
+msgstr "Ð?Ñ?оме Ñ?ого, BridgeDB Ñ?одеÑ?жиÑ? множеÑ?Ñ?во обÑ?Ñ?нÑ?Ñ? моÑ?Ñ?ов %s без какиÑ?-либо\nподклÑ?Ñ?аемÑ?Ñ? Ñ?Ñ?анÑ?поÑ?Ñ?ов %s. ÐÑ?о не Ñ?ак кÑ?Ñ?Ñ?о вÑ?глÑ?диÑ?, но во многиÑ? Ñ?лÑ?Ñ?аÑ?Ñ?\nпозволÑ?еÑ? обÑ?одиÑ?Ñ? инÑ?еÑ?неÑ?-Ñ?ензÑ?Ñ?Ñ?.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
-msgstr "ЧÑ?о Ñ?акое Ñ?оединение Ñ?ипа моÑ?Ñ??"
+msgstr "ЧÑ?о Ñ?акое моÑ?Ñ??"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ð?оÑ?Ñ? %s â?? Ñ?Ñ?о Ñ?еÑ?евое Ñ?оединение в Ñ?еÑ?и Tor, коÑ?оÑ?ое позволÑ?еÑ? вам пÑ?оÑ?маÑ?Ñ?иваÑ?Ñ? заблокиÑ?ованнÑ?е Ñ?айÑ?Ñ?."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?Ñ?Ñ?гой Ñ?поÑ?об полÑ?Ñ?ение Ñ?пиÑ?ка Ñ?оединений Ñ?ипа моÑ?Ñ?!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ð?еÑ? Ñ?оединениÑ? Ñ? моÑ?Ñ?ом! Ð?омогиÑ?е!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?Ñ?ли Tor не запÑ?Ñ?каеÑ?Ñ?Ñ?, напиÑ?иÑ?е нам на Ñ?лекÑ?Ñ?оннÑ?й адÑ?еÑ? %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 Browser."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ð?Ñ?ли Tor Browser не можеÑ? вÑ?полниÑ?Ñ? Ñ?оединение, пожалÑ?йÑ?Ñ?а, обÑ?аÑ?иÑ?е внимание на %s и %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "СÑ?Ñ?ока ввода адÑ?еÑ?ов моÑ?Ñ?ов:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ð?олÑ?Ñ?иÑ?Ñ? адÑ?еÑ? моÑ?Ñ?а!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Ð?еÑ?анизмÑ? Ñ?аÑ?пÑ?еделениÑ? моÑ?Ñ?ов"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Ð?еÑ?анизм Ñ?аÑ?пÑ?еделениÑ? \"HTTPS\" пеÑ?едаеÑ? моÑ?Ñ?Ñ? Ñ?еÑ?ез Ñ?Ñ?оÑ? веб-Ñ?айÑ?. ЧÑ?обÑ? полÑ?Ñ?иÑ?Ñ?\nмоÑ?Ñ?Ñ?, пеÑ?ейдиÑ?е на %sbridges.torproject.org%s, вÑ?беÑ?иÑ?е ваÑ?и пÑ?едпоÑ?Ñ?иÑ?елÑ?нÑ?е паÑ?амеÑ?Ñ?Ñ? и\nÑ?еÑ?иÑ?е поÑ?ледÑ?Ñ?Ñ?Ñ?Ñ? капÑ?Ñ?."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Ð?олÑ?зоваÑ?ели могÑ?Ñ? запÑ?оÑ?иÑ?Ñ? моÑ?Ñ?Ñ? из меÑ?анизма Ñ?аÑ?пÑ?еделениÑ? \"ÐлекÑ?Ñ?оннаÑ? поÑ?Ñ?а\", оÑ?пÑ?авив\nÑ?лекÑ?Ñ?онное пиÑ?Ñ?мо по адÑ?еÑ?Ñ? %sbridges@xxxxxxxxxxxxxx%s и напиÑ?ав \"get transport obfs4\"\nв Ñ?еле пиÑ?Ñ?ма."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?еÑ?"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ð?ожалÑ?йÑ?Ñ?а, вÑ?беÑ?иÑ?е паÑ?амеÑ?Ñ?Ñ? Ñ?ипа моÑ?Ñ?а:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ð?Ñ?полÑ?зÑ?еÑ?е адÑ?еÑ?а IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?Ñ?деÑ?е иÑ?полÑ?зоваÑ?Ñ? %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ð?Ñ?аÑ?зеÑ? некоÑ?Ñ?екÑ?но оÑ?обÑ?ажаеÑ? изобÑ?ажениÑ?."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Ð?ведиÑ?е Ñ?имволÑ? Ñ? изобÑ?ажениÑ?..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ð?ак иÑ?полÑ?зоваÑ?Ñ? моÑ?Ñ?Ñ??"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "ЧÑ?обÑ? добавиÑ?Ñ? новÑ?й моÑ?Ñ? в %s Tor Browser, необÑ?одимо пеÑ?ейÑ?и на Ñ?Ñ?Ñ?аниÑ?Ñ? загÑ?Ñ?зки Tor Browser %s и Ñ?ледоваÑ?Ñ? инÑ?Ñ?Ñ?Ñ?кÑ?иÑ?м по Ñ?каÑ?иваниÑ? и запÑ?Ñ?кÑ? Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?еÑ?ейÑ?и во вкладкÑ? 'СеÑ?евÑ?е наÑ?Ñ?Ñ?ойки Tor', далее нажаÑ?Ñ? 'Ð?аÑ?Ñ?Ñ?оиÑ?Ñ?' и Ñ?ледоваÑ?Ñ? инÑ?Ñ?Ñ?Ñ?кÑ?иÑ?м Ñ?Ñ?Ñ?ановÑ?ика, пока вÑ? не Ñ?видиÑ?е вопÑ?оÑ?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Ð?локиÑ?Ñ?еÑ? ли ваÑ? инÑ?еÑ?неÑ? пÑ?овайдеÑ? подклÑ?Ñ?ениÑ? к Ñ?еÑ?и Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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во вкладке 'СеÑ?евÑ?е наÑ?Ñ?Ñ?ойки Tor' длÑ? полÑ?Ñ?ениÑ? помоÑ?и."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?апÑ?оÑ?иÑ?Ñ? обÑ?Ñ?нÑ?е моÑ?Ñ?Ñ?."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?апÑ?оÑ?иÑ?Ñ? моÑ?Ñ?Ñ? Ñ? поддеÑ?жкой IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?апÑ?оÑ?иÑ?Ñ? подклÑ?Ñ?аемÑ?й Ñ?Ñ?анÑ?поÑ?Ñ? TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Ð?олÑ?Ñ?иÑ?Ñ? копиÑ? оÑ?кÑ?Ñ?Ñ?ого GnuPG-клÑ?Ñ?а BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
index 23e3b7d..ec68c47 100644
--- a/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sk/LC_MESSAGES/bridgedb.po
@@ -1,11 +1,12 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# elo, 2014
# FooBar <thewired@xxxxxxxxxx>, 2015
# Marek Ä?ápek <capek.marek@xxxxxxxxx>, 2019
+# Matúš <mato699@xxxxxxxxx>, 2019
# Michal Slovák <michalslovak2@xxxxxxxxxxx>, 2013
# Roman 'Kaktuxista' Benji <romanbeno273@xxxxxxxxx>, 2014
# StefanH <inactive+StefanH@xxxxxxxxxxxxx>, 2014
@@ -13,116 +14,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-04-10 06:45+0000\n"
-"Last-Translator: Marek Ä?ápek <capek.marek@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: sk\n"
"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n == 1 ? 0 : n % 1 == 0 && n >= 2 && n <= 4 ? 1 : n % 1 != 0 ? 2: 3);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "PrepáÄ?te! Pri spracovanà vaÅ¡ej požiadavky sa vyskytla chyba."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jazyk"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Nahlásiť chybu"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Zdrojový kód"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Posledné zmeny"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "OznaÄ?iÅ¥ vÅ¡etko"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Zobraziť QR Kód"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
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
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Práve niesú dostupné žiadne premostenia..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Krok %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Krok %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "ZÃskajte %s premostenia %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Krok %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
@@ -131,27 +147,27 @@ msgstr "Teraz %s pridajte premostenia do Tor Browsera %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sL%sen mi zobrazte premostenia!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "PokroÄ?ilé možnosti"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nie"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sÃ?%sno!"
@@ -159,69 +175,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Tu sú vaše premostenia:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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é."
-#: 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".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Vitajte v BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Práve podporované transport typy:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ahoj, priateľ!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Tento email bol generovaný s dúhami, jednorožcami a trblietkami pre %s dÅ?a %s o %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +216,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -244,7 +228,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +237,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Ä?o sú to premostenia?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Potrebujem iný spôsob ako zÃskaÅ¥ premostenia!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Moje premostenia nefungujú! Potrebujem pomoc!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Ak sa váš prehliadaÄ? Tor nemôže pripojiÅ¥, skúste sa pozrieÅ¥ na %s a na naÅ¡u %s. "
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Tu sú vaše premostenia:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "ZÃskaÅ¥ premostenia!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Žiadny"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "ProsÃm vyberte si možnosti na typ premostenia:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 adresy?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Váš prehliadaÄ? nezobrazuje obrázky správne."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Vložte znaky z obrázku vyššie..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ako zaÄ?aÅ¥ použÃvaÅ¥ vaÅ¡e premostenia"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Blokuje alebo nejak cenzuruje váš Poskytovateľ Internetu (ISP) pripojenia k Sieti Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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Ã. "
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Požiadať o pôvodné premostenia."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Požiadať o IPv6 premostenia."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Požiadať o Pluggable Transport podla typu."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Stiahnite si kópiu verejného klúÄ?a GNUPG pre BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po
index 8f70002..de1480a 100644
--- a/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sl/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Lovro Drofenik <lovro.drofenik@xxxxx>, 2018
@@ -11,116 +11,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-16 06:52+0000\n"
-"Last-Translator: Rok Kepa <rokkepa@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\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"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Oprostite! Z vašo zahtevo je bilo nekaj narobe."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Prijavi napako"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Izvorna koda"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Novosti"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Stik"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Vse"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Prikaži QR kodo"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR koda za mostovne povezave"
-#. 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, Å¡pageti :)"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Napak pri izdelavi QR kode"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 koda vsebuje mostovne povezave. Slikaj kodo za kopiranje mostovnih povezav na mobilne in druge naprave."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Trenutno ni na voljo mostovnih povezav..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "MogoÄ?e je bolje, Ä?e %s greÅ¡ nazaj %s in izbereÅ¡ drugo vrsto mosta."
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Korak %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Poberi %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Korak %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Dobi %s bridges %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Korak %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
@@ -129,27 +144,27 @@ msgstr "Zdaj %s dodaj mostove v Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sS%samo dodaj mostove!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Napredno"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ne"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "niÄ?"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -157,69 +172,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sD%sobi mostove"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[To je avtomatsko sporoÄ?ilo. Ne odgovarjaj.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Tvoji mostovi:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "Presegel si omejitve. UpoÄ?asni! NajmanjÅ¡i Ä?as me email-i je %s ur. Vsi naslednji email-i bojo spredlegani."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ukazi: (združite ukaze razliÄ?nih možnosti hkrati) "
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Dobrodošli v BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Trenutno podprti TIPI:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Oj, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Pozdravljen!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Javni kljuÄ?"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Ta email so zgenerirani Å¡kratje iz Narnije za %s na %s pri %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -230,7 +213,7 @@ msgid ""
msgstr "BridgeDB zagotavljajo mostiÄ?ke z razliÄ?nimi %stipi Pluggable prevozi%s,\nki lahko pomagajo zmesti vaÅ¡o povezavo z Tor omrežjem, in jo naredijo bolj\nnepregledno za vsakogar, ki spremlja vaÅ¡ internetni promet z namenom ugotavljanja\nuporabe Tor.\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -242,7 +225,7 @@ msgstr "Nekateri mostiÄ?ki z IPv6 naslovi so tudi dosegljivi, Ä?eprav nekateri P
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -251,134 +234,169 @@ msgid ""
"\n"
msgstr "Dodatno, BridgeDB ima mnogo nezanimih mostiÄ?kov %s brez kakrÅ¡njihkoli\ntransportnih vtiÄ?nikov %s ki morda ne zvenijo dobro, vendar Å¡e vedno\npomagajo pri preslepitvi internetne cenzure v mnogih primerih\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Kaj so mostovi?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Mostovi %s so Tor releji, ki pomagajo zaobiti cenzuro."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Potrebujem drug naÄ?in za priti do mosta!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Drug naÄ?in za zbiranje mostiÄ?kov je preko naÅ¡e e-poÅ¡te %s. Zapomnite si, da morate poslati e-pismo z uporabo naslova naslednjih e-poÅ¡tnih ponudnikov\n%s, %s ali %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Moji mostovi ne delujejo! Potrebujem 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 "Ä?e vaÅ¡ Tor brskalnik ne deluje, poÅ¡ljite elektronsko poÅ¡to na naslov %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Poskusite vkljuÄ?iti Ä?im veÄ? informacij o vaÅ¡em primeru,\nvkljuÄ?no s seznamom\nmostiÄ?kov in transportnih vtiÄ?nikov, ki ste jih uporabili, verzijo Tor iskalnik\nin vsa sporoÄ?ila, ki vam jih je dal Tor, itd."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Tu so vrstice mostiÄ?kov:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Pridobite si mostiÄ?ke!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "NiÄ?"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Izberite tip mostiÄ?ka:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Potrebujete IPv6 naslove?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Potrebujete %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Vaš brskalnik ne prikazuje slik pravilno."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Vnesite znake vsebovane v zgornji sliki..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Kako zaÄ?eti uporabljati svoje mostove"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Da vstavite mostove v brskalnik Tor, pojdite najprej na %s stran za naložitev brskalnika Tor %s in sledite navodilom za naložitev in zagon brskalnika Tor."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ko se 'Nastavitve Tor omrežja' okence pojavi, kliknite 'Nastavi' in sledite navodilom Ä?arovnika, dokler ne vpraÅ¡a:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Ali vaÅ¡ ponudnik internetnih storitev (ISP) blokira ali kako drugaÄ?e cenzurira povezave na Tor omrežje?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Izberite 'Da' in nato kliknite 'Naprej'. Za nastavitev vaÅ¡ih novih mostov, kopirajte in prilepite povezave mostov v prostor za vnos besedila. Zdaj pritisnite 'Poveži' in moralo bi delovati! Ä?e se pojavijo problemi poskusite klikniti tipko 'PomoÄ?' v Ä?arovniku za 'Nastavitve Tor omrežja' za nadaljnjo pomoÄ?."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Prikaži to sporoÄ?ilo."
-
-#. 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 "Zahteva za vanilla mostiÄ?ke."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Zaprosi za IPv6 mostove."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Zahtevjte transportne vtiÄ?nike po tipu."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Pridobite kopijo javnega GnuPG kljuÄ?a za BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
index e3c8f9b..8e9c340 100644
--- a/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sq/LC_MESSAGES/bridgedb.po
@@ -1,124 +1,141 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Bujar Tafili, 2015
# Mirela Pacani <milela00@xxxxxxxxx>, 2016
+# obial <oltionb@xxxxxxxxx>, 2019
+# Skender Mustafi <1mail2me@xxxxxxxxx>, 2019
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: Besnik <besnik@xxxxxxxxxxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: sq\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Kërkojmë ndjesë! Diçka shkoi keq me kërkesën tuaj."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Gjuhë"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Raportoni një gabim"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
-msgstr "Kodi Burimor"
+msgstr "Kodi Bazë"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Regjistri i ndryshimeve"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
-msgstr "Përzgjidhini të Gjitha"
+msgstr "Zgjidhi të Gjitha"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Tregoni Kodin QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+msgstr "Kodi QR për linjat e urave tuaja"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
-msgstr "Duket se u has një gabim, duke marrë Kodin tuaj QR."
+msgstr "Ndodhi një gabim në marrjen e Kodit tuaj QR."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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."
+msgstr "Ky Kod QR përmban linjat e urave tuaja. Skanojeni me një lexues Kodi QR, që të kopjoni linjat e urave tuaja në celular, apo pajisje të tjera."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
-msgstr "Këtë çast s'ka asnjë urë të disponueshme..."
+msgstr "Për momentin nuk ka ura të disponueshme..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Hapi %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Hapi %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Merrni %s ura %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Hapi %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Tani %s shtojini urat tek Tor Browser %s"
@@ -127,27 +144,27 @@ msgstr "Tani %s shtojini urat tek Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sM%së jepni urat!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Opsionet e Përparuara"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Jo"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sP%so!"
@@ -155,69 +172,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
-msgstr "%sM%serrni Urat"
+msgstr "%sM%serr 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.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
-msgstr "Këtu janë urat tuaja:"
+msgstr "Ja ku janë urat tuaja:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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."
+msgstr "Ju e keni kapërcyer kufirin e shpejtësisë. Ju lutemi, më ngadalë! Koha minimum midis \nmesazheve elektronike është %s orë. Të gjitha mesazhet elektronike gjatë kësaj periudhe kohe do të injorohen."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
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".
-#: 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".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Transport TYPEs të mbështetura këtë çast: "
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Përshëndetje mik!"
-
-#: 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@xxxxxxxxxxx on Friday, 09 May, 2014 at 18:59:39."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Kjo e-postë është gjeneruar me ylberë, njëbrirësha dhe shkëndija\npër %s, më %s, në orën %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,7 +213,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".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -240,7 +225,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -249,134 +234,169 @@ 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"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "�'janë urat?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, 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."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Më nevojitet një mënyrë alternative për përftimin e urave!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "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."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Urat e mia nuk punojnë! Më duhet ndihmë!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Këtu janë linjat e urave tuaja:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Merrni Ura!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Asnjë"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ju lutemi përzgjidhni mundësitë për llojin e urës:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "A ju nevojiten adresat IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "A ju nevojitet një %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Shfletuesi juaj nuk po i shfaq si duhet imazhet."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Futini karakteret nga imazhi më sipër..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Si të nisni t'i përdorni urat tuaja"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "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."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
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:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "A i pengon apo i censuron Ofruesi juaj i Shërbimt Internet (ISP) lidhjet\ntek rrjeti Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"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."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Kërkoni urat vanilje ose non-Pluggable Transport."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Kërkoni urat IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Kërkoni një Pluggable Transport nëpërmjet TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Merrni një kopje të kyçit publik GnuPG të BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
index cf9b486..4dd6851 100644
--- a/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sr/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,8 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
# Aleksa RistiÄ?, 2019
# an lykin <lykin@xxxxxxxxxxxxxx>, 2018
# Pseudoscops, 2018
@@ -16,116 +15,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-07-10 11:07+0000\n"
-"Last-Translator: Aleksa RistiÄ?\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Serbian (http://www.transifex.com/otf/torproject/language/sr/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: sr\n"
"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?звиниÑ?е! Ð?огодила Ñ?е гÑ?еÑ?ка Ñ?а ваÑ?им заÑ?Ñ?евом."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Jezik"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?Ñ?иÑ?авиÑ?е гÑ?еÑ?кÑ?"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?звоÑ?ни код"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ð?невник измена"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?онÑ?акÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ð?бележи Ñ?ве"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ð?Ñ?икажи QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ð?згледа да Ñ?е доÑ?ло до гÑ?еÑ?ке пÑ?и добиÑ?аÑ?Ñ? ваÑ?ег QR kода."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "ТÑ?енÑ?Ñ?но нема доÑ?Ñ?Ñ?пниÑ? пÑ?емоÑ?Ñ?иваÑ?а..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Ð?оÑ?ак %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Ð?Ñ?еÑ?змиÑ?е %s пÑ?егледаÑ? ТоÑ? %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Ð?оÑ?ак %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?обиÑ?Ñ?е %s пÑ?емоÑ?Ñ?иваÑ?е %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Ð?оÑ?ак %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Сада %s додаÑ?Ñ?е пÑ?емоÑ?Ñ?иваÑ?е Ñ? пÑ?егледаÑ? ТоÑ?%s"
@@ -134,27 +148,27 @@ msgstr "Сада %s додаÑ?Ñ?е пÑ?емоÑ?Ñ?иваÑ?е Ñ? пÑ?егледа
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sС%sамо ми даÑ? пÑ?емоÑ?Ñ?иваÑ?е!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Ð?апÑ?едне опÑ?иÑ?е"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ð?е"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "нема"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sТ%sо!"
@@ -162,69 +176,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sÐ?%sобиÑ?Ñ?е пÑ?емоÑ?Ñ?иваÑ?е"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ð?во Ñ?е аÑ?Ñ?омаÑ?Ñ?ка поÑ?Ñ?ка; молимо ваÑ? да не одговаÑ?аÑ?е.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ð?во Ð?аÑ?иÑ? пÑ?емоÑ?Ñ?иваÑ?а:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 Ñ?аÑ?и. Сва наÑ?една е-поÑ?Ñ?а Ñ?оком овог пеÑ?иода биÑ?е игноÑ?иÑ?ана. "
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "COMMANDs: (комбинÑ?Ñ?Ñ?е COMMANDs да одÑ?едиÑ?е виÑ?еÑ?Ñ?Ñ?Ñ?ке опÑ?иÑ?е иÑ?Ñ?овÑ?емено)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?обÑ?одоÑ?ли Ñ? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ТÑ?енÑ?Ñ?но подÑ?жани ТÐ?Ð? пÑ?еноÑ?а:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?дÑ?аво, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?дÑ?аво, пÑ?иÑ?аÑ?еÑ?Ñ?!"
-
-#: 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."
-#: 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."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,7 +217,7 @@ msgid ""
msgstr "BridgeDB може обезбедиÑ?и пÑ?емоÑ?Ñ?иваÑ?е Ñ?а неколико %s Ñ?ипова пÑ?икÑ?Ñ?Ñ?ниÑ? пÑ?еноÑ?а %s,\nÑ?Ñ?о може помоÑ?и пÑ?икÑ?иваÑ?Ñ? ваÑ?иÑ? конекÑ?иÑ?а Ñ?а Ð?Ñ?ежом ТоÑ?, како би било\nкоме ко поÑ?маÑ?Ñ?а ваÑ? инÑ?енеÑ? Ñ?аобÑ?аÑ?аÑ? било Ñ?еже да Ñ?Ñ?вÑ?ди да\nкоÑ?иÑ?Ñ?иÑ?е ТоÑ?.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -247,7 +229,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -256,134 +238,169 @@ msgid ""
"\n"
msgstr "Ð?оÑ?ед Ñ?ога, BridgeDB има пÑ?но наÑ?обиÑ?ниÑ?иÑ? пÑ?емоÑ?Ñ?Ñ?иваÑ?а %s без икаквиÑ?\nпÑ?икÑ?Ñ?Ñ?ниÑ? пÑ?еноÑ?а %s Ñ?Ñ?о можда не звÑ?Ñ?и Ñ?олико кÑ?л, али они ипак\nÑ? много Ñ?лÑ?Ñ?аÑ?ева могÑ? помоÑ?и да Ñ?е заобиÑ?е инÑ?еÑ?неÑ? Ñ?ензÑ?Ñ?а.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "ШÑ?а Ñ?Ñ? пÑ?емоÑ?Ñ?иваÑ?и?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ð?Ñ?емоÑ?Ñ?иваÑ?и %s Ñ?Ñ? ТоÑ? пÑ?еноÑ?ниÑ?и коÑ?и Ð?ам помажÑ? да заобиÑ?еÑ?е Ñ?ензÑ?Ñ?Ñ?."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?оÑ?Ñ?ебан ми Ñ?е алÑ?еÑ?наÑ?иван наÑ?ин за добиÑ?аÑ?е пÑ?емоÑ?Ñ?иваÑ?а!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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. УзмиÑ?е Ñ? обзиÑ? да\nмоÑ?аÑ?е поÑ?лаÑ?и и-меÑ?л коÑ?иÑ?Ñ?еÑ?и адÑ?еÑ?Ñ? Ñ?едног од Ñ?ледеÑ?иÑ? и-меÑ?л пÑ?оваÑ?деÑ?а.\n%s, %s или %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ð?оÑ?и пÑ?емоÑ?Ñ?иваÑ?и не Ñ?аде! Ð?оÑ?Ñ?ебна ми Ñ?е помоÑ?!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Ð?ко Ð?аÑ? ТоÑ? не Ñ?ади, поÑ?аÑ?иÑ?е елекÑ?Ñ?онÑ?кÑ? поÑ?Ñ?Ñ? %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "УнеÑ?иÑ?е Ñ?Ñ?о виÑ?е инÑ?оÑ?маÑ?иÑ?а о ваÑ?ем Ñ?лÑ?Ñ?аÑ?Ñ?, Ñ?кÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ?и Ñ?пиÑ?ак\nмоÑ?Ñ?ова и пÑ?икÑ?Ñ?ивиÑ? Ñ?Ñ?анÑ?поÑ?Ñ?а коÑ?е Ñ?Ñ?е покÑ?Ñ?али да коÑ?иÑ?Ñ?иÑ?е, \nвеÑ?зиÑ?Ñ? ваÑ?ег Ñ?оÑ? пÑ?еÑ?Ñ?аживаÑ?а, било \nкоÑ?Ñ? поÑ?Ñ?кÑ? коÑ?Ñ? вам Ñ?е ТоÑ? избаÑ?ио, иÑ?д."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ð?во Ð?аÑ?иÑ? линиÑ?а пÑ?емоÑ?Ñ?иваÑ?а:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ð?обиÑ?Ñ?е пÑ?емоÑ?Ñ?иваÑ?е!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?иÑ?едан"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ð?олимо Ð?аÑ?, изабеÑ?иÑ?е опÑ?иÑ?е за вÑ?Ñ?Ñ?Ñ? пÑ?емоÑ?Ñ?иваÑ?а:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ð?а ли Ñ?Ñ? Ð?ам поÑ?Ñ?ебне IPv6 адÑ?еÑ?е?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?а ли Ð?ам Ñ?Ñ?еба %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ? пÑ?егледаÑ? не пÑ?иказÑ?Ñ?е Ñ?лике иÑ?пÑ?авно."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "УнеÑ?иÑ?е знакове Ñ?а Ñ?лике изнад..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Ð?ако да поÑ?неÑ?е Ñ?а коÑ?иÑ?Ñ?еÑ?ем Ð?аÑ?иÑ? пÑ?емоÑ?Ñ?иваÑ?а"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Ð?а биÑ?Ñ?е Ñ?нели пÑ?емоÑ?Ñ?иваÑ?е Ñ? пÑ?еÑ?Ñ?аживаÑ? Tor, пÑ?ви идиÑ?е на Ñ?Ñ?Ñ?аниÑ?и %s за пÑ?еÑ?зимаÑ?е %s \nпÑ?еÑ?Ñ?аживаÑ?а ТоÑ? и Ñ?амо пÑ?аÑ?иÑ?е Ñ?пÑ?Ñ?Ñ?Ñ?ва за пÑ?еÑ?зимаÑ?е и покÑ?еÑ?аÑ?е пÑ?еÑ?Ñ?аÑ?иваÑ?а ТоÑ?."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?ада Ñ?е диÑ?алог 'Ð?одеÑ?аваÑ?а ТоÑ? мÑ?еже' поÑ?ави, кликниÑ?е 'Ð?онÑ?игÑ?Ñ?иÑ?и' и пÑ?аÑ?иÑ?е Ñ?пÑ?Ñ?Ñ?Ñ?ва до пиÑ?аÑ?а:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Ð?а ли ваÑ? инÑ?еÑ?неÑ? Ñ?еÑ?виÑ? пÑ?оваÑ?деÑ? (Ð?СÐ?) блокиÑ?а или на било коÑ?и наÑ?ин Ñ?ензÑ?Ñ?иÑ?е повезиваÑ?е на ТоÑ? мÑ?ежÑ??"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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налепиÑ?е линиÑ?е пÑ?емоÑ?Ñ?иваÑ?а Ñ? поÑ?е за Ñ?ноÑ? Ñ?екÑ?Ñ?а. Ð?онаÑ?но, кликниÑ?е на 'конекÑ?Ñ?Ñ? Ñ?е', i\nможеÑ?е да поÑ?неÑ?е! Ð?ко бÑ?деÑ?е имали пÑ?облема, кликниÑ?е на дÑ?гме 'Ð?омоÑ?'\nÑ? Ñ?аÑ?обÑ?акз за подеÑ?аваÑ?а мÑ?еже ТоÑ? за даÑ?Ñ? помоÑ?."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?аÑ?Ñ?ева базиÑ?не пÑ?емоÑ?Ñ?иваÑ?е."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?аÑ?Ñ?ева IPv6 пÑ?емоÑ?Ñ?иваÑ?е."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?аÑ?Ñ?еба пÑ?икÑ?Ñ?Ñ?иви пÑ?еноÑ? по ТÐ?Ð?У."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Ð?обиÑ?Ñ?е копиÑ?Ñ? кÑ?Ñ?Ñ?а BridgeDB Ñ?авног GnuPG."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
index 8cc0f27..d401de5 100644
--- a/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/sv/LC_MESSAGES/bridgedb.po
@@ -1,14 +1,14 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Anders Jensen-Urstad <anders@xxxxxxx>, 2014
# Emil Johansson <emil.a.johansson@xxxxxxxxx>, 2015
# Gabor Sebastiani, 2014
# Jacob Andersson <jacob.c.andersson@xxxxxxxxxxxxxx>, 2018
-# Jonatan Nyberg, 2017
-# Jonatan Nyberg, 2018-2019
+# Jonatan Nyberg <jonatan.nyberg.karl@xxxxxxxxx>, 2017
+# Jonatan Nyberg <jonatan.nyberg.karl@xxxxxxxxx>, 2018-2020
# Peter Michanek <peter@xxxxxxxxxxx>, 2015
# Petomatick <petomatick@xxxxxxxxxxx>, 2011
# ph AA, 2015
@@ -19,116 +19,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-05-01 08:49+0000\n"
-"Last-Translator: Jonatan Nyberg\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-19 05:32+0000\n"
+"Last-Translator: Jonatan Nyberg <jonatan.nyberg.karl@xxxxxxxxx>\n"
"Language-Team: Swedish (http://www.transifex.com/otf/torproject/language/sv/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: sv\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Något gick tyvärr fel med din förfrågan."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Språk"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Rapportera ett fel"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Källkod"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Ã?ndringslogg"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Kontakt"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Markera allt"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Visa QR-kod"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "QR-kod för dina brorader"
-#. 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 "Bomber och granater, något gick snett!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Det verkar som att ett fel orsakade problem att få din QR-kod."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Denna QR-kod innehåller dina rader med broar. Skanna den med en QR-kodläsare för att kopiera dina rader med broar till mobila och andra enheter."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB stötte på ett fel."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "För närvarande finns inga broar tillgängliga..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Prova att %s gå tillbaka %s för att välja en annan typ av bro!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Steg %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Hämta %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Steg %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Skaffa %s broar %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Steg %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Lägg nu till %s broarna till Tor Browser%s"
@@ -137,27 +152,27 @@ msgstr "Lägg nu till %s broarna till Tor Browser%s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%sara ge mig broar!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "Avancerade inställningar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Nej"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "inget"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sJ%sa!"
@@ -165,69 +180,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sH%sämta broar"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Detta är ett automatiskt meddelande; Var god svara ej]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Detta är ett automatiserat e-postmeddelande.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Här är dina broar:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
-msgstr "Du har överskridit din nivå. Ta det lugnt! Minsta tillåtna tiden mellan epost är %s timmar. Epost utöver detta kommer att ignoreras."
-
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMMANDOn: (kombinera KOMMANDOn för att ange flera val på en gång)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Välkommen till BridgeDB!"
+msgstr "Du har överskridit gränsvärdet. Snälla sakta ner! Minsta tillåtna tiden mellan e-postmeddelanden är %s timmar. Alla ytterligare e-postmeddelanden utöver detta kommer att ignoreras under denna tidsperiod."
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "För närvarande stöds följande transport TYPEs:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Hej, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Hej, kompis!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Publika nycklar"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Det här mailet skapades med hjälp av regnbågar, enhörningar och \nett regn av gnistor för %s den %s kl %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Om dessa broar inte är vad du behöver, svara på detta e-postmeddelande med en av\nföljande kommandon i meddelandebrödtexten:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -235,158 +218,193 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB kan tillhandahålla broar med flera %styper av Pluggable Transports%s,\nsom kan omforma din trafik till Tor Network, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n"
+msgstr "BridgeDB kan tillhandahålla broar med flera %styper av Pluggbara transporter%s,\nsom kan omforma din trafik till Tor-nätverket, vilket gör det svårare för någon\nsom avlyssnar din internetuppkoppling att veta ifall du använder Tor.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
"\n"
-msgstr "Det finns några broar med IPv6-adresser tillgängliga, men vissa Pluggable\nTransports är inte IPv6-kompatibla.\n"
+msgstr "Det finns några broar med IPv6-adresser tillgängliga, men vissa Pluggbara\n transporter är inte IPv6-kompatibla.\n"
#. TRANSLATORS: Please DO NOT translate "BridgeDB".
#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
#. which do not have Pluggable Transports, and only speak the regular,
#. boring Tor protocol. Translate it as you see fit. Have fun with it.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "Dessutom har BridgeDB några alldeles vanliga broar %s utan Pluggable\nTransports %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n"
+msgstr "Dessutom har BridgeDB några alldeles vanliga broar %s utan Pluggbara\ntransporter %s vilket kanske inte låter så häftigt, men i många fall kan de \nfortfarande hjälpa dig med att kringgå internet-censur.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Vad är broar?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Broar %s är Tor-reläer som hjälper dig kringgå censur."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Jag behöver ett alternativt sätt att skaffa broar på!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Ett annat sätt att få nya broar är att skicka e-post till %s. Du måste skicka mailet\nfrån en adress hos någon av följande e-postleverantörer:\n%s, %s eller %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Ett annat sätt att få broar är att skicka ett e-postmeddelande till %s. Lämna ämnet för e-postmeddelandet\ntomt och skriv \"get transport obfs4\" i e-postmeddelandet. Vänligen observera\natt du måste skicka e-postmeddelandet med en adress från ett av följande e-post-\nleverantörer: %s eller %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Mina broar fungerar inte! Jag behöver hjälp!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Om Tor inte fungerar för dig så kan du e-posta %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Försök att berätta så mycket om problemet som du kan, bland annat vilka\nbroar och Pluggable Transports som du försökt använda, vilken version av Tor Browser du använder, vilka felmeddelanden som Tor visat, etc."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Om din Tor Browser inte kan ansluta, vänligen ta en titt på %s och våra %s."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Här är dina rader med broar:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Skaffa broar!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Brofördelningsmekanismer"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB implementerar fyra mekanismer för att distribuera broar: \"HTTPS\", \"Moat\",\n\"E-mail\" och \"Reserved\". Broar som inte distribueras över BridgeDB använder\npseudo-mekanismen \"None\". Följande lista förklarar kortfattat hur dessa\nmekanismer fungerar och våra %sBridgeDB statistik%s visualisera hur populär varje\nmekanismer är."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "Distributionsmekanismen \"HTTPS\" delar ut broar över denna webbplats. För att\nfå broar, gå till %sbridges.torproject.org%s, välj ditt önskade alternativ och\nlös efterföljande CAPTCHA."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "Distributionsmekanismen \"Moat\" är en del av Tor Browser, så att användarna kan\nbegär broar inifrån sina inställningar i Tor Browser. För att få broar, gå till\ndina %sTor-inställningar%s i Tor Browser, klicka på \"begär en ny bro\", lös\nföljande CAPTCHA och Tor Browser kommer automatiskt lägga till dina nya\nbroar."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "Användare kan begära broar från distributionsmekanismen \"Email\" genom att skicka en\ne-post till %sbridges@xxxxxxxxxxxxxx%s och skriva \"get transport obfs4\" i\ne-postbrödtexten."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "Reserved"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB upprätthåller ett litet antal broar som inte distribueras\nautomatiskt. Istället reserverar vi dessa broar för manuell distribution och\ndela ut dem till icke-statliga organisationer och andra organisationer och individer som behöver\nbroar. Broar som är fördelade över mekanismen \"Reserved\" får inte\nse användare under lång tid. Observera att \"Reserved\" distributionsmekanismen\nkallas \"Unallocated\" i %sbropooluppdrags%sfiler."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ingen"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "Broar vars distributionsmekanism är \"None\" distribueras inte av BridgeDB.\nDet är brooperatörens ansvar att distribuera sina broar till\nanvändare. Observera att vid Reläsökning, är en nyligen inställd bros\ndistributionsmekanismen \"None\" för upp till ungefär en dag. Var lite tålmodig, och\ndetta kommer då att ändras till brons faktiska distributionsmekanism.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
-msgstr "Välj alternativ för typ av bro:"
+msgstr "Vänligen välj alternativ för typ av bro:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Behöver du en IPv6-adress?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Behöver du %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Din webbläsare visar inte bilder korrekt."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Skriv in tecknen från bilden ovan..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Hur du börjar använda dina broar"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "För att ange broar i Tor Browser, gå till %s hämtningssidan för Tor Browser %s och följ instruktionerna för att hämta och starta Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr " Först måste du %shämta Tor Browser%s. Vår användarmanual för Tor\n Browser förklarar hur du kan lägga till dina broar i Tor Browser. Om du använder\n Windows, Linux, or OS X, %sklicka här%s för att lära dig mer. Om du\n använder Android, %sklicka här%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "När dialogen \"Nätverksinställningar för Tor\" visas, välj \"Konfigurera\" och följ\nstegen tills du kommer till frågan:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Lägg till dessa broar i din Tor Browser genom att öppna inställningarna\ni din webbläsare, klicka på \"Tor\" och lägg sedan till dem i fältet \"Ange en\nbro\"."
-#. 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 "Blockerar eller filtrerar din Internetleverantör (ISP) anslutningar till Tor network?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(Begär icke-dolda Tor-broar.)"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Välj 'Ja' och klicka sedan på 'Nästa'. För att konfigurera nya broar, kopiera och klistra in broraderna i textrutan. Klicka slutligen på 'Anslut' och det borde vara klart för användning! Om du får problem, prova att klicka på 'Hjälp'-knappen i 'Tor Network Settings' för vidare hjälp."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Visa detta meddelande."
-
-#. 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 "Leta efter vanliga broar."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Begär IPv6-broar"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Leta efter en Pluggable Transport av en viss TYPE"
+msgid "(Request IPv6 bridges.)"
+msgstr "(Begär IPv6-broar.)"
-#. 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 "Hämta en kopia av BridgeDB:s publika GnuPG-nyckel."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(Begär obfs4 dolda broar.)"
diff --git a/bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..27f77d1
--- /dev/null
+++ b/bridgedb/i18n/sw/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Zaituni Njovu <zaituni@xxxxxxxxxxxxxxxxxxxxx>, 2019
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Swahili (http://www.transifex.com/otf/torproject/language/sw/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.8.0\n"
+"Language: sw\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Samahani! Kitufulani kimekwenda vibaya pamoja na ombi lako."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Ripoti Bug"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Chanzo msimbo"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Badili log"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Chagua zote"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "Onyesha QR msimbo"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "QR msimbo kwa mistari ya daraja"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "Inaonekana kuna kosa katika kupata QR msimbo wako."
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid ""
+"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
+" your bridge lines onto mobile and other devices."
+msgstr "Msimbo huu wa QR unanayo mistari ya daraja lako. Scan msimbo wa QR msomaji kutoa nakala ya daraja lako kwa simu na vifaa vingine."
+
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "Huko sasa hakuna madaraja yoyote yanayopatikana..."
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "Labda ujaribu 1%s kurudi 1%s na uchague aina tofauti ya daraja!"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "Hatua 1%s 1 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "Pakua 1%s Kivinjari cha Tor 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr "Pata 1%s madaraja 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "Hatua 1%s 3 1%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, python-format
+msgid "Now %s add the bridges to Tor Browser %s"
+msgstr "Sasa 1%s ongeza madaraja kwa Kivinjari cha Tor 1%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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "1%s J 1%s ust nipe mimi daraja!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "chaguo la juu"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "hapana"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Hakuna"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr "1%s Y 1%s es!"
+
+#. TRANSLATORS: Please make sure the '%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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "1%s G 1%s et Madaraja"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Hapa ndio madaraja yako:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Ni nini madaraja?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "1%s Madaraja 1%s ni Tor relays inakusaidia wewe kukimbia uthibiti."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr "Nahitaji njia nyingine ya kupata madaraja mbadala!"
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr "Madaraja yangu hayafanyi kazi! Ninahitaji msaada!"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "Hapa ni mistari ya daraja lako:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "Pata madaraja!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Hakuna"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "Tafadhali chagua chaguo kwa aina ya daraja:"
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "Unahitaji anuani za IPv6?"
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Unahitaji 1%s ?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "Kivinjari chako hakionyeshi picha vizuri."
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "Ingiza maneno kutoka kwenye picha juu..."
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "Jinsi ya kuanza kutumia madaraja yako"
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
index 855f43c..32d94a5 100644
--- a/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/ta/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Anto Sujesh <sujeshantoj@xxxxxxxxx>, 2015
@@ -8,120 +8,136 @@
# Ephraim Raj <ephraimraj11299@xxxxxxxxx>, 2016
# git12a <git12@xxxxxxxxxxxxxxx>, 2015
# Senthil Kumar <paranthaba@xxxxxxxxx>, 2017
+# Stymy RAT, 2019
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-01-15 12:20+0000\n"
-"Last-Translator: erinm\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: ta\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "மன�னி���வ�ம�! ����ள� வ�ண�����ளிற��� �த��ர� தவற� ந�ர�ந�த�ள�ளத�."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "ம�ாழி"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "�ர� பிழ�ய� �றி������ய��"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "ம�ல த���ப�ப�"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "மாற�றம���றி����ம� ��ாப�ப�"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "த��ர�ப� ��ள�"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "�ன�த�த�ய�ம� த�ர�ந�த���"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "��ய� �ர� ��றிய��� �ாண�பி "
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "����ள���ய bridge வரி�ள����ான 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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "��ய� �ர� ��றிய��� ������ ம��ியாத�"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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 ����ள� bridge வரி�ள� �ள�ள����ிய�ள�ளத�. ��ல�லி�ப��ி மற�ற�ம� வ�ற� �ாதன���ளில� ����ள� bridge வரி�ள� நிரல������ QRCode வா�ிப�பான� ம�லம� �த� ���ற�வி பார����வ�ம�."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "தற��மயம� Bridge-�ள� ய�த�ம� �ல�ல�..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "��ி %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "பதிவிற���வ�ம� %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "��ி %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Bridge-�ள� %s ப�ற��"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "��ி %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "�ப�ப�ழ�த� %s bridge-�ள� Tor Browser-�ள� %s ��ர����வ�ம�"
@@ -130,27 +146,27 @@ msgstr "�ப�ப�ழ�த� %s bridge-�ள� Tor Browser-�ள� %s
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sந�%sரய�ியா� bridge-�ள� �������வ�ம�!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "ம�ம�ப��� விர�ப�ப���ள�"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "�ல�ல�"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "�த�வ�மில�ல�"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%s�%sம�!"
@@ -158,69 +174,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, 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 "[ �த� �ர� தானிய���ி ��ய�தி; தயவ� ��ய�த� பதில� �ன�ப�ப வ�ண��ாம�.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "�த� ����ள� bridges:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 மணி�ள�. �ந�த ந�ரத�தின�ள� �ன�த�த� மின�ன���ல��ள�ம� நிரா�ரி���ப�ப��ம�."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "����ள��ள�: (பல விர�ப�ப���ள� ��றிப�பி� ����ள��ள� �ர��மயத�தில� �ன�றியின��வ�ம�)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB-யின�ள� நல�வரவ�"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "தற�ப�ாத� �தரவ� �ள�ள Transport TYPE-�ள� "
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ஹ�, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ஹல�ா, த�ழா!"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "�ந�த மின�ன���ல� வானவில�, ய�னி�ார�ன��ள� மற�ற�ம� �ிற�த�ப�ப�றி�ள� ��ண��� \n%s -�ா� %s �ன�ற� %s ந�ரத�தில� �ர�வா���ப�ப���த�."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -231,7 +215,7 @@ msgid ""
msgstr "BridgeDB-யால� %sபலவ��யான Pluggable Transports%s bridge-�ள� தரம��ிய�ம�,\n�வ� ����ள� Tor Network �ண�ப�ப��ள� விள���ாதவண�ணம� ����வ�தவி, ����ளின� \n�ண�ய ப�ா����வரத�த� �ண��ானிப�பவர����� ந����ள� Tor பயன�ப��த�த��ிற�ர��ள� �ன���ன��றிய ம�ல�ம�\n��ினம� �����ம�.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -243,7 +227,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -252,134 +236,169 @@ msgid ""
"\n"
msgstr "����தலா�, BridgeDB-யின�ள� �ராளமான பழ�யம�ற� bridge-�ள� \n%s Pluggable Transports வ�தியில�லாமல� �ள�ளத� %s �ணர����ி ������ிறவாற� �ல�லாவி���ால�ம�, \n�வ�யால� பல �ந�தர�ப�ப���ளில� �ன�ய தணி����ய� ����� �தவ�ம�.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Bridges �ன�றால� �ன�ன?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Bridge-�ள� %s �ன�ம� Tor Relay-�ள� தணி����ய� ����� �தவ�ம�"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "�ன���� Bridge-�ள� ப�ற�வதற��� �ர� மாற�ற� வழி வ�ண���ம�"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Bridge-�ள� ப�ற�வதற��� �ர� மாற�ற�வழி %s ம��வரி���� �ர� மின�ன���ல� �ன�ப�பலாம�.\nதயவ� ��ய�யத� �வனி���வ�ம�, ந����ள� ����ாயமா� ��ழ��ண�� மின�ன���ல� ��வ��ளின� ம��வரியிலிர�ந�த� ம����ம� மின�ன���ல� �ன�ப�பலாம� :\n%s, %s or %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "�ன� Bridge-�ள� வ�ல� ��ய�யவில�ல�! �ன���� �தவி த�வ�!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "����ள� Tor வ�ல� ��ய�யவில�ல� �னில�, ந����ள� %s த��ர�ப���ள�� "
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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��ரியத�வல��ள� ப�ான�றவற�ற�ய�ம� ��ர����வ�ம�."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "����ள���ய Tor Browser �ல� �ண���� ம��ியவில�ல�ய�னில�, தயவ� ��ய�த� %sய�ம� நமத� %sய�ம� �ாண��."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "�த� ����ள� bridge வரி���ள�: "
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Bridge-�ள� ப�ற��!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "யார�ம�"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Bridge வ�� விர�ப�ப���ள� த�ர�ந�த������வ�ம�:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "����ள����� IPv6 ம��வரி�ள� வ�ண���மா?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "����ள����� �ர� %s த�வ�யா?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr " த���ளின� browser ப����ள� �ரியா� �ா���வில�ல�."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "ம�ல� �ள�ள ப�த�தில� �ர�����ம� �ழ�த�த����ள� �ள�ளி�வ�ம�..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "த���ளின� bridge-�ள� பயன�ப��த�த த�ா�����வத� �ப�ப�ி"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Tor �லாவியில� bridge�ள� �ள�ள��� ��ய�ய, ம�தலில� %s Tor �லாவி பதிவிற��� ப���த�திற��� ��ன�ற� %s ம�ல�ம� பிற�� ����� Tor �லாவிய� பதிவிற���ம� மற�ற�ம� த������வதற��ான �றிவ�ற�த�தல��ள� பின�பற�ற����ள�."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "'Tor ந���வ�ார��� �ம�ப�ப��ள�' �ர�யா�ல� ம�ல�த�ான�ற�ம� ப�ழ�த�, '����ம����' �ிளி����ய�த� \nவழி�ா���ிய� �த� ������ம�வர� பின�பற�றவ�ம�:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "����ளின� �ண�ய ��வ� வழ����ம� (ISP) நிற�வனம� Tor ந���வ�ர��� த�����ிறதா �ல�லத� \nவ�ற�வழியில� தணி���� ��ய��ிறதா? "
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'�ம�' த�ர�ந�த���த�த� பின�னர� '���த�த�' �ிளி�� ��ய�யவ�ம�. த���ளின� ப�திய bridge-�ள� ����ம����, \nவரி���ள� வா���ியம� �ள�ள�t�� ப����ியில� ந�ல����த�த� ப�ஸ��� ��ய�யவ�ம�. �ற�தியா�, '�ண����' �ிளி�� \n��ய�தவ��ன�, ந����ள� ��ல�ல தயார�! ந����ள� பிர���ின�ய� �ந�தித�தால�, 'Tor ந���வ�ார��� �ம�ப�ப��ள�' \nவழி�ா���ியில� �ள�ள '�தவி' ப�ாத�தான� �ிளி�� ��ய�த� ம�ல�ம� �தவி ப�றவ�ம�."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "பழ�யம�ற�யான bridge-�ள� விண�ணப�பி���வ�ம�."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 bridge-�ள� விண�ணப�பி���வ�ம�."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Pluggable Transport bridge-�ள� TYPE வ��யில� விண�ணப�பி���வ�ம�."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 " BridgeDB-ய���ய ப�ாத� GnuPG �ாவியின� �ர� ந�ல� ப�றவ�ம�."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po
index a8b6727..418410f 100644
--- a/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/th/LC_MESSAGES/bridgedb.po
@@ -1,101 +1,409 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2013 ORGANIZATION
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Translators:
-# AomNicha <vainilla7@xxxxxxxxx>, 2013
+# bact' <arthit@xxxxxxxxx>, 2017
+# bact' <arthit@xxxxxxxxx>, 2017,2020
+# BlackDog ForThai <myblackdog@xxxxxxx>, 2015
+# DN DN <deen6@xxxxxxxxxxxxxx>, 2019
+# Ella Rudland <atwwtkp@xxxxxxxxx>, 2015
+# exploiz, 2014
+# exploiz, 2014
+# kanesayan gwangsai <thailand.1.2009.00067.77.9@xxxxxxxxx>, 2016
+# lanichita <vainilla7@xxxxxxxxx>, 2013
+# Nipattra Chaiprakobwiriya <patt.nipattra@xxxxxxxxx>, 2019
+# lanichita <vainilla7@xxxxxxxxx>, 2013
msgid ""
msgstr ""
-"Project-Id-Version: The Tor Project\n"
-"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n"
-"POT-Creation-Date: 2013-03-27 21:41+0000\n"
-"PO-Revision-Date: 2013-07-27 08:50+0000\n"
-"Last-Translator: AomNicha <vainilla7@xxxxxxxxx>\n"
-"Language-Team: Thai (http://www.transifex.com/projects/p/torproject/language/th/)\n"
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
+"Language-Team: Thai (http://www.transifex.com/otf/torproject/language/th/)\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 2.8.0\n"
"Language: th\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-#: lib/bridgedb/templates/base.html:33
-msgid "What are bridges?"
-msgstr "สะà¸?าà¸?หมายà¸?ึà¸?à¸à¸°à¹?ร"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "à¸?à¸à¸à¸ ัย! มีà¸à¸°à¹?รà¸?ิà¸?à¸?à¸?à¸?ิà¹?à¸?ิà¸?à¸?ึà¹?à¸?à¸?ัà¸?à¸?ำà¸?à¸à¸?à¸à¸?à¸?ุà¸?"
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "ภาษา"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "�����ั��"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "à¸?à¸à¸£à¹?สà¹?à¸?à¹?à¸?"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "�ูม�วาม��ลี�ย���ล�"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "à¹?ลืà¸à¸?à¸?ัà¹?à¸?หมà¸?"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "�ส��รหัส QR"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr "รหัส QR สำหรัà¸?à¹?สà¹?à¸?à¸?าà¸?à¸?ริà¸?à¸?à¹?à¸?à¸à¸?à¸?ุà¸?"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "à¹?หมืà¸à¸?à¸?ะมีà¸?à¹?à¸à¸?ิà¸?à¸?ลาà¸?ระหวà¹?าà¸?รัà¸?รหัส QR à¸?à¸à¸?à¸?ุà¸?"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+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/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr "�ั��ุ�ั��ี��ม�มี�ริ����ี�������"
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr "à¸?à¹?าà¸?à¸?วรà¸?ะลà¸à¸?à¸?ู %s à¸?ลัà¸? %s à¹?ลืà¸à¸?à¸?ระà¹?ภà¸?à¸?ริà¸?à¸?à¹?à¹?มà¹?à¹?หมืà¸à¸?à¹?à¸?ิมà¸à¸²à¸?à¹?à¸?à¹?à¸?à¹?à¸?à¹?"
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "ลำ�ั�%s1%s"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr "�าว���หล� %s Tor Browser %s"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "ลำ�ั�%s2%s"
-#: lib/bridgedb/templates/base.html:34
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
+msgid "Get %s bridges %s"
+msgstr "à¹?à¸à¸² %s à¸?ริà¸?à¸?à¹? มา %s"
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "ลำ�ั�%s3%s"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, 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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr "%sà¹?à¸à¸²%sà¸?ริà¸?à¸?à¹?à¹?หà¹?à¸?ัà¸?à¹?à¸?à¹?าà¸?ัà¹?à¸?!"
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "à¸?ัวà¹?ลืà¸à¸?à¸?ัà¹?à¸?สูà¸?"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "�ม�"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "��ล�า"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, 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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr "%sà¹?à¸à¸²%sà¸?ริà¸?à¸?ฺมา"
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "à¸?ริà¸?à¸?à¹?à¸?à¸à¸?à¸?à¹?าà¸?"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate 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 à¸?ัà¹?วà¹?มà¸?\nà¸à¸µà¹?มลà¸à¸·à¹?à¸?à¹?à¸?à¸?ีà¹?สà¹?à¸?à¹?à¸?ระหวà¹?าà¸?à¹?วลาà¸?ีà¹?à¸?ะà¸?ูà¸?à¹?à¸?ิà¸?à¹?à¸?ย"
+
+#: bridgedb/strings.py:40
msgid ""
-"%s Bridge relays %s are Tor relays that help you circumvent censorship."
-msgstr "%s สะà¸?าà¸?รีà¹?ลยà¹? %s à¸?ืภTor รีà¹?ลยà¹? à¸?ีà¹?à¸?à¹?วยà¹?หà¹?à¸?ุà¸?สามารหลีà¸?หà¸?ีà¸?ารà¸?รวà¸?สà¸à¸?"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
-#: lib/bridgedb/templates/base.html:39
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr "BridgeDB สามารà¸?à¸?ัà¸?หาà¹?หà¹?à¸?ริà¸?à¸?à¹?à¸?ึà¹?à¸?มี %s Pluggable Transports à¸?à¹?าà¸?à¸?à¸?ิà¸?à¹?à¸?à¹?%s,\nà¸?ึà¹?à¸?สามารà¸?à¸?à¹?วยà¸?ำà¹?หà¹?à¸?ารà¹?à¸?ืà¹?à¸à¸¡à¸?à¹?à¸à¸?ัà¸? à¹?à¸?รืà¸à¸?à¹?าย Tor à¹?à¸?à¹?à¸?ยุà¹?à¸?à¹?หยิà¸?, à¸?ึà¹?à¸?à¸?ะà¸?ำà¹?หà¹?\nลำà¸?าà¸?มาà¸?à¸?วà¹?าสำหรัà¸?à¸?ุà¸?à¸?ลà¸?ำลัà¸?มà¸à¸?à¹?หà¹?à¸?à¸?ารà¸?ิà¸?à¸?à¹?à¸à¸à¸´à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?à¹?à¸?à¸?à¸à¸?à¸?ุà¸?à¹?à¸?ืà¹?à¸à¸?à¸?วà¹?าà¸?ุà¸?\nà¸?ำลัà¸?à¹?à¸?à¹? Tor.\n\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr "มีà¸?ริà¸?à¸?ฺà¸?าà¸?à¸à¸±à¸?à¸?ีà¹?มีหมายà¹?ลà¸? IPv6 à¸?à¹?วย à¹?มà¹?วà¹?า Pluggable\nTransports à¸?าà¸?สà¹?วà¸?à¹?มà¹?สามารà¸?à¸?ำà¸?าà¸?รà¹?วมà¸?ัà¸? IPv6.\n\n"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr "ยิà¹?à¸?à¸?วà¹?าà¸?ัà¹?à¸? BridgeDB มีà¸?ริà¸?à¸?ฺมาà¸?รà¸?าà¸? %s à¹?à¸?ยà¹?มà¹?มี\nPluggable Transports %s\nà¸?ีà¹?à¸?à¹?วยหลีà¸?à¹?ลีà¹?ยà¸?à¸?ารà¹?à¸?à¹?à¸?à¹?à¸?à¸à¸£à¹?à¹?à¸?สà¸?าà¸?à¸?ารà¸?à¹?สà¹?วà¸?มาà¸?\n\n"
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "à¸?ริà¸?à¸?à¹?à¸?ืà¸à¸à¸°à¹?ร?"
+
+#: bridgedb/strings.py:79
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr "%s à¸?ริà¸?à¸?à¹? %s à¸?ืภTor รีà¹?ลยà¹?à¸?ีà¹?à¸?à¹?วยà¹?หà¹?à¸?ุà¸?หลีà¸?à¹?ลีà¹?ยà¸?à¸?ารà¹?à¸?à¹?à¸?à¹?à¸?à¸à¸£à¹?."
+
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
-msgstr "à¸?ัà¸?à¸?à¹?à¸à¸?à¸?ารà¸?าà¸?à¹?ลืà¸à¸?à¸à¸·à¹?à¸?à¹?à¸?ืà¹?à¸à¹?à¸?à¹?าà¸?ึà¸?สะà¸?าà¸?"
+msgstr "à¸?à¹?à¸à¸?à¸?ารà¸?าà¸?à¹?ลืà¸à¸?à¹?à¸?ืà¹?à¸à¹?à¸?à¹?à¸?ริà¸?à¸?à¹?"
-#: lib/bridgedb/templates/base.html:40
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, python-format
msgid ""
-"Another way to find public bridge addresses is to send an email (from a %s "
-"or a %s address) to %s with the line 'get bridges' by itself in the body of "
-"the mail."
-msgstr "à¸à¸µà¸?หà¸?ึà¹?à¸?à¸?à¹?à¸à¸?à¸?าà¸? สำหรัà¸?à¸?à¹?à¸?หาà¸?ีà¹?à¸à¸¢à¸¹à¹?à¸?à¸à¸?สะà¸?าà¸?สาà¸?ารà¸?ะ สามารà¸?à¸?ำà¹?à¸?à¹?à¸?à¹?าà¸?à¸?ารสà¹?à¸?à¸à¸µà¹?มล (à¸?าà¸? %s หรืภà¸?ีà¹?à¸à¸¢à¸¹à¹? %s) à¹?à¸?สูà¹? %s à¸?à¹?วยà¹?สà¹?à¸?à¸?าà¸? \"\n\"à¸?ารà¹?à¸?à¹?าà¸?ึà¸?สะà¸?าà¸?\" ภายà¹?à¸?à¹?à¸?ืà¹?à¸à¸«à¸²à¸?à¸à¸?à¸à¸µà¹?มล"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "à¸à¸µà¸?วิà¸?ีà¸?ีà¹?à¸?ะà¸?ราà¸?รายà¸?ืà¹?à¸à¸?ริà¸?à¸?à¹?à¸?ืภà¹?หà¹?สà¹?à¸?à¸à¸µà¹?มลà¹?à¸?à¸?ีà¹? %s à¹?à¸?ยà¹?วà¹?à¸?วà¹?าà¸?หัวà¸?à¹?ภ(subject)\nà¸?à¸à¸?à¸à¸µà¹?มลà¹?วà¹? à¹?ละà¹?à¸?à¸?ัวà¸?à¸?หมายà¹?หà¹?à¹?à¸?ียà¸?วà¹?า \"get transport obfs4\" à¹?à¸?รà¸?à¸?ราà¸?à¸?à¹?วยวà¹?า\nà¸?ุà¸?à¸?ะà¸?à¹?à¸à¸?สà¹?à¸?à¸à¸µà¹?มลà¹?à¸?ยà¹?à¸?à¹?à¸?ีà¹?à¸à¸¢à¸¹à¹?à¸à¸µà¹?มลà¸?าà¸?หà¸?ึà¹?à¸?à¹?à¸?à¸?ูà¹?à¹?หà¹?à¸?ริà¸?ารà¸à¸µà¹?มลà¸?ัà¸?à¸?à¹?à¸à¹?à¸?à¸?ีà¹?:\n%s หรืภ%s"
-#: lib/bridgedb/templates/base.html:48
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
-msgstr "à¸?à¹?à¸à¸?à¸?ารà¸?วามà¸?à¹?วยà¹?หลืภสะà¸?าà¸?à¹?มà¹?à¸?ำà¸?าà¸?"
+msgstr "à¸?ริà¸?à¸?à¹?à¹?มà¹?à¸?ำà¸?าà¸? à¸?à¹?à¸à¸?à¸?ารà¸?วามà¸?à¹?วยà¹?หลืภ"
-#: lib/bridgedb/templates/base.html:49
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
#, python-format
msgid ""
-"If your Tor doesn't work, you should email %s. Try including as much info "
-"about your case as you can, including the list of bridges you used, the "
-"bundle filename/version you used, the messages that Tor gave out, etc."
-msgstr "à¸?à¹?า Tor à¹?มà¹?à¸?ำà¸?าà¸? à¹?หà¹?à¸?ุà¸?สà¹?à¸?à¸à¸µà¹?มล %s à¸?รà¹?à¸à¸¡à¹?à¸?à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?ีà¹?ยวà¸?ัà¸?สà¸?าà¸?à¸?ารà¸?à¹?à¸?à¸à¸?à¸?ุà¸? รายà¸?ืà¹?à¸à¸?à¸à¸?สะà¸?าà¸?à¸?ีà¹?à¸?ุà¸?à¹?à¸?ยà¹?à¸?à¹? à¸?ัà¸?à¸?ีรายà¸?ืà¹?à¸à¸«à¸£à¸·à¸à¹?วà¸à¸£à¹?à¸?ัà¹?à¸?à¸?ีà¹?à¸?ุà¸?à¹?à¸?ยà¹?à¸?à¹? à¸?à¹?à¸à¸?วามà¸?ีà¹? Tor สà¹?à¸?à¸?ึà¸?à¸?ุà¸? à¹?ละà¸à¸·à¹?à¸?à¹? à¸?ีà¹?à¸?ำà¹?à¸?à¹?à¸?"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "หาà¸? Tor Browser à¸?à¸à¸?à¸?ุà¸?à¹?มà¹?สามารà¸?à¹?à¸?ืà¹?à¸à¸¡à¸?à¹?à¸à¹?à¸?à¹? à¸?รุà¸?าà¸?รวà¸?สà¸à¸?à¸?ีà¹? %s à¹?ละà¸?ีà¹? %s"
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr "à¸?ำหà¸?à¸?à¹?สà¹?à¸?à¸?าà¸?à¸?ริà¸?à¸?à¹?à¸?à¸à¸?à¸?ุà¸?à¸?ีà¹?à¸?ีà¹?:"
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr "รั��ริ���"
-#: lib/bridgedb/templates/bridges.html:10
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
msgid ""
-"To use the above lines, go to Vidalia's Network settings page, and click "
-"\"My ISP blocks connections to the Tor network\". Then add each bridge "
-"address one at a time."
-msgstr " à¹?à¸?ืà¹?à¸à¹?à¸?à¹?à¸?าà¸?à¸?ามà¸?ำà¹?à¸?ะà¸?ำà¸?à¹?าà¸?à¸?à¸? à¹?à¸?à¸?ีà¹?à¸?ารà¸?ัà¹?à¸?à¸?à¹?าà¹?à¸?รืà¸à¸?à¹?าย Vidalia à¸?าà¸?à¸?ัà¹?à¸?à¸?ลิà¸?à¸?ีà¹? \"à¹?à¸à¹?à¸à¸ªà¸?ีà¸?à¸à¸?à¸?ัà¸?à¸?ูà¸?à¸?ิà¸?à¸?ัà¹?à¸?à¹?มà¹?à¹?หà¹?à¹?à¸?ืà¹?à¸à¸¡à¸?à¹?à¸à¸?ัà¸?à¹?à¸?รืà¸à¸?à¹?าย\" Tor à¹?ละà¸?à¸?à¹?à¸?ิà¹?มà¸?ีà¹?à¸à¸¢à¸¹à¹?à¸?à¸à¸?สะà¸?าà¸?à¹?à¸?à¹?ละà¸à¸±à¸?ลà¸?à¹?à¸?"
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
-#: lib/bridgedb/templates/bridges.html:13
-msgid "No bridges currently available"
-msgstr "�ม�มีสะ�า��ี�����า��������ะ�ี�"
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:6
-msgid "Upgrade your browser to Firefox"
-msgstr "à¸?à¹?วยà¸?รัà¸?รุà¹?à¸?à¹?à¸?ราวà¹?à¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?ุà¸?à¹?à¸?à¹?à¸?à¹?à¸?ลà¹?à¸?à¹?à¸à¸?"
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
-#: lib/bridgedb/templates/captcha.html:8
-msgid "Type the two words"
-msgstr "à¹?หà¹?à¸?ิมà¸?à¹?à¸?ำสà¸à¸?à¸?ำ"
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
-#: lib/bridgedb/templates/index.html:6
-msgid "Step 1"
-msgstr "à¸?ัà¹?à¸?à¸?à¸à¸?à¸?ีà¹? 1"
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
-#: lib/bridgedb/templates/index.html:8
+#: bridgedb/strings.py:130
#, python-format
-msgid "Get %s Tor Browser Bundle %s"
-msgstr "��� %s Tor Browser Bundle %s"
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "�ม�มี"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr "à¸?รุà¸?าà¹?ลืà¸à¸?à¸?ัวà¹?ลืà¸à¸?สำหรัà¸?à¸?à¸?ิà¸?à¸?à¸à¸?à¸?ริà¸?à¸?à¹?:"
-#: lib/bridgedb/templates/index.html:13
-msgid "Step 2"
-msgstr "à¸?ัà¹?à¸?à¸?à¸à¸?à¸?ีà¹? 2"
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr "à¸?ุà¸?à¸?à¹?à¸à¸?à¸?ารà¸?ีà¹?à¸à¸¢à¸¹à¹? IPv6?"
-#: lib/bridgedb/templates/index.html:15
+#: bridgedb/strings.py:150
#, python-format
-msgid "Get %s bridges %s"
-msgstr "��� %s สะ�า� %s"
+msgid "Do you need a %s?"
+msgstr "à¸?ุà¸?à¸?à¹?à¸à¸?à¸?าร %s?"
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr "à¸?ราวà¹?à¸?à¸à¸£à¹?à¸?à¸à¸?à¸?ุà¸?à¹?มà¹?à¹?สà¸?à¸?à¸?ลà¸à¸¢à¹?าà¸?à¸?ีà¹?à¸?วร"
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr "à¸?ิมà¸?à¹?à¸?ัวà¸à¸±à¸?ษรà¸?าà¸?ภาà¸?à¸?à¹?าà¸?à¸?à¸?..."
-#: lib/bridgedb/templates/index.html:19
-msgid "Step 3"
-msgstr "à¸?ัà¹?à¸?à¸?à¸à¸?à¸?ีà¹? 3"
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr "à¹?ริà¹?มà¸?à¹?à¸?à¹?à¸?à¹?à¸?าà¸?à¸?ริà¸?à¸?à¹?à¸?à¸à¸?à¸?ุà¸?à¹?à¸?à¹?à¸à¸¢à¹?าà¸?à¹?ร"
-#: lib/bridgedb/templates/index.html:21
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
#, python-format
-msgid "Now %s add the bridges to Tor %s"
-msgstr "��ะ�ี� %s �����ิ�มสะ�า����ี� Tor %s �ล�ว"
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
index 0dd1a08..7303776 100644
--- a/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/tr/LC_MESSAGES/bridgedb.po
@@ -1,23 +1,24 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Bullgeschichte <bullgeschichte@xxxxxxxxxx>, 2015
# eromytsatiffird <driffitastymore@xxxxxxxxx>, 2014
-# Emir Sarı <bitigchi@xxxxxxxxxxxxxxx>, 2014
+# Emir Sarı <bitigchi@xxxxxx>, 2014
# Emre <conan@xxxxxxxxxxxxx>, 2013
# erg26 <ergungorler@xxxxxxxxx>, 2012
# erg26 <ergungorler@xxxxxxxxx>, 2012
# eromytsatiffird <driffitastymore@xxxxxxxxx>, 2014
# Fomas <fomas.adana@xxxxxxxxx>, 2015
# Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
-# Kaya Zeren <kayazeren@xxxxxxxxx>, 2015-2016,2018-2019
+# Kaya Zeren <kayazeren@xxxxxxxxx>, 2015-2016,2018-2020
# Ozancan KarataÅ? <ozancankaratas96@xxxxxxxxxxx>, 2015
# ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
# Idil Yuksel <idilyuksel@xxxxxxxxxxx>, 2014
# Sercan AltundaÅ? <>, 2012
# ozkansib <s.ozkan@xxxxxxxxxxx>, 2014
+# T. E. Kalayci <tekrei@xxxxxxxxx>, 2020
# Tekel Bira <psycookie@xxxxxxxxx>, 2012
# Volkan Gezer <volkangezer@xxxxxxxxx>, 2014-2016
# zeki <zeki.ozguryazilim@xxxxxxxxx>, 2014
@@ -26,116 +27,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-04-09 02:36+0000\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-16 00:11+0000\n"
"Last-Translator: Kaya Zeren <kayazeren@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"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: tr\n"
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ã?zgünüz! Ä°steÄ?iniz ile ilgili bir Å?eyler ters gitti."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Dil"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Bir Hata Bildirin"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Kaynak Kodu"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Sürüm Notları"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ä°letiÅ?im"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Tümünü Seç"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "QR Kodunu Görüntüle"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
msgstr "Köprü satırlarınızın QR Kodu"
-#. 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 "Haydi hayırlısı!"
-
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "QR Kodunuzun alınmasında bir sorun çıkmıÅ? gibi görünüyor."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "Bu QR Kodunda köprü satırlarınız bulunuyor. Köprü satırlarınızı bir mobil aygıta ya da baÅ?ka aygıtlara kopyalamak için bu kodu bir QR Kodu tarayıcısına okutun."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr "BridgeDB ile ilgili bir sorun çıktı."
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Å?u anda kullanılabilecek bir köprü yok..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "Belki %s geri dönmeyi %s ve farklı bir köprü türü seçmeyi denemelisiniz!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "%s1%s. Adım"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "%s Tor Browser Uygulamasını %s indirin"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "%s2%s. Adım"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "%s Köprüleri %s edinin"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "%s3%s. Adım"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "Å?imdi %s Tor Browser üzerine köprüler ekleyin %s"
@@ -144,27 +160,27 @@ msgstr "Å?imdi %s Tor Browser üzerine köprüler ekleyin %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sB%sana sadece köprüleri verin!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "GeliÅ?miÅ? Ayarlar"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Hayır"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
-msgstr "hiçbiri"
+msgstr "yok"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sE%svet!"
@@ -172,69 +188,37 @@ msgstr "%sE%svet!"
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sK%söprüleri Al"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Bu otomatik bir iletidir; lütfen yanıtlamayın.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[Bu otomatik bir e-postadır.]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ä°Å?te köprüleriniz:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "E-posta sınırınızı aÅ?tınız. Lütfen yavaÅ?layın! E-postalar arasındaki en az zaman %s saattir.\nBu süre içinde göndereceÄ?iniz diÄ?er e-postalarınız gözardı edilecektir."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "KOMUTlar: (birden fazla seçeneÄ?ı aynı anda belirtmek için KOMUTları birleÅ?tirin)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "BridgeDB'ye HoÅ? Geldiniz!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "Å?u an desteklenen aktarım TÃ?Rleri:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Selam, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Selam, arkadaÅ?!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Herkese Açık Anahtarlar"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Bu e-posta %s için %s %s tarihinde gökkuÅ?akları, tek boynuzlu atlar\nve ıÅ?ıltılarla oluÅ?turuldu."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "Ä°stedikleriniz bu köprüler deÄ?ilse, ileti gövdesine Å?u komutlardan \nbirini yazarak bu e-postayı yanıtlayın:"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -245,7 +229,7 @@ msgid ""
msgstr "BridgeDB, çeÅ?itli %stürde DeÄ?iÅ?tirilebilir TaÅ?ıyıcılar%s içeren köprüler saÄ?layabilir.\nBöylece Tor AÄ?ı üzerine yaptıÄ?ınız baÄ?lantılar karıÅ?tırılarak, Ä°nternet trafiÄ?inizi\nizleyen birinin Tor kullandıÄ?ınızı anlaması zorlaÅ?tırılabilir.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -257,7 +241,7 @@ msgstr "IPv6 kullanan bazı köprüler olmasına raÄ?men bazı DeÄ?iÅ?tirilebili
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -266,134 +250,169 @@ msgid ""
"\n"
msgstr "Ayrıca BridgeDB %s üzerinde herhangi bir DeÄ?iÅ?tirilebilir TaÅ?ıyıcı kullanmayan %s birçok eski, sıradan\nve özelliksiz vanilla köprüsü bulunur. KulaÄ?a pek iyi gelmeyebilir ancak bu köprüler hala pek çok\ndurumda Ä°nternet engellemelerini aÅ?makta yardımcı olabilir.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Köprü nedir?"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Köprüler %s Ä°nternet kısıtlamalarını aÅ?manıza yardımcı olan Tor aktarıcılarıdır."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Köprüleri edinmek için baÅ?ka bir yola gerek duyuyorum!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Köprüleri edinmenin diÄ?er bir yolu da %s adresine bir e-posta göndermektir.\nLütfen e-postanın aÅ?aÄ?ıdaki e-posta saÄ?layıcıların birinden alınmıÅ? bir\nadresten gönderilmesi gerektiÄ?ini unutmayın:\n%s, %s ya da %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "Köprüleri almanın diÄ?er bir yolu da %s adresine bir e-posta göndermektir. E-posta\nkonusunu boÅ? bırakıp ileti içeriÄ?i olarak \"get transport obfs4\" yazın. Lütfen e-postanın \naÅ?aÄ?ıdaki e-posta hizmeti saÄ?layıcıların birinden alınmıÅ? bir adresten gönderilmesi \ngerektiÄ?ini unutmayın: %s ya da %s."
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Köprülerim çalıÅ?mıyor! Yardım gerek!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "Tor uygulamanız çalıÅ?mıyorsa %s adresine e-posta göndermelisiniz."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "Durumunuz hakkında olabildiÄ?ince fazla bilgi verin.\nKullanmaya çalıÅ?tıÄ?ınız köprü listesi ve DeÄ?iÅ?tirilebilir TaÅ?ıyıcılar, Tor Browser sürümünüz,\nTor tarafından görüntülenen tüm iletiler gibi."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Tor Browser baÄ?lantı kuramıyorsa lütfen %s ve %s bölümlerine bakın."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ä°Å?te köprü satırlarınız:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Köprüleri Al!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "Köprü daÄ?ıtma yöntemleri"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr "BridgeDB köprüleri Å?u dört farklı yöntemle daÄ?ıtır: \"HTTPS\", \"Moat\",\n\"E-posta\" ve \"AyrılmıÅ?\". BridgeDB üzerinden daÄ?ıtılmayan köprüler için sözde bir\nyöntem olan \"Yok\" kullanılır. AÅ?aÄ?ıdaki listede bu yöntemlerin nasıl çalıÅ?tıÄ?ını \nve her bir yöntemin ne sıklıkta kullanıldıÄ?ını görebileceÄ?iniz \n%sBridgeDB istatistikleri%s bulunuyor."
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr "\"HTTPS\" daÄ?ıtım yöntemi köprüleri bu web sitesi üzerinden daÄ?ıtır. Köprüleri\nedinmek için %sbridges.torproject.org%s adresine gidin, yeÄ?lediÄ?iniz seçenekleri seçin ve\ngüvenlik kodunu çözün."
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr "\"Moat\" daÄ?ıtım yöntemi Tor Browser içinde bulunur ve kullanıcıların Tor Browser \nayarları bölümünden köprü isteÄ?inde bulunmalarını saÄ?lar. Köprüleri edinmek için\nTor Browser %sTor ayarları%s bölümüne giderek, \"Yeni Köprü Ä°steÄ?inde Bulun\" \nüzerinde tıklayın ve güvenlik kodunu çözün. Tor Browser yeni köprüleri \notomatik olarak ekler."
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr "\"E-posta\" daÄ?ıtım yönteminde kullanıcılar %sbridges@xxxxxxxxxxxxxx%s\nadresine gönderecekleri bir iletinin içeriÄ?ine \"get transport obfs4\" yazarak\nköprü isteÄ?inde bulunabilir."
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr "AyrılmıÅ?"
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr "BridgeDB otomatik olarak daÄ?ıtılmayan az sayıda köprü için bir liste tutar. \nBu köprüleri otomatik olarak daÄ?ıtmak yerine el ile daÄ?ıtmak için ayırdık.\nBunları köprü gereksinimi olan STK gibi kuruluÅ?lara ve bireylere veriyoruz.\n\"AyrılmıÅ?\" yöntem ile daÄ?ıtılan köprülerde uzun süre hehrnagi bir kullanıcı bulunmayabilir. \nLütfen \"AyrılmıÅ?\" daÄ?ıtım yönteminin %sköprü havuz ataması%s dosyalarında \"AtanmamıÅ? (Unallocated)\" olarak görüleceÄ?ini unutmayın."
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Yok"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr "DaÄ?ıtım yöntemi \"Yok\" olan köprüler BridgeDB tarafından daÄ?ıtılmaz.\nBu köprülerin kullanıcılara daÄ?ıtılması, köprü iÅ?leticisinin sorumluluÄ?undadır.\nAktarıcı Arama içinde, yeni kurulmuÅ? bir köprünün daÄ?ıtım yönteminin bir gün kadar \"Yok\" olarak görüntüleneceÄ?ini unutmayın.\nSabırla bekleyin. Bir süre sonra köprünün gerçek daÄ?ıtım yöntemi görüntülenir.\n"
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Lütfen köprü türü seçeneklerini belirleyin:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "IPv6 adresleri gerekli mi?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "%s gerekli mi?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Tarayıcınız görselleri düzgün görüntülemiyor."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Yukarıdaki görselde bulunan karakterleri yazın..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Köprülerinizi nasıl kullanabilirsiniz"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Tor Browser üzerine köprüler eklemek için\n%s Tor Browser indirme sayfasına %s\ngidin ve Tor Browser indirme ve baÅ?latma yönergelerini izleyin."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "Ã?nce %sTor Browser uygulamasını indirmelisiniz%s. Tor Browser üzerine\nköprülerin nasıl ekleneceÄ?ini Tor Browser rehberinde bulabilirsiniz.\nWindow, Linux ya da OS X kullanıyorsanız, ayrıntılı bilgi almak için %sburaya tıklayın%s.\nAndroid kullanıyorsanız, %sburaya tıklayın%s."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "'Tor AÄ?ı Ayarları' penceresi açıldıÄ?ında, 'Ayarla' üzerine tıklayın ve Å?u soru soruluncaya\ndek yardımcıyı izleyin:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "Bu köprüleri Tor Browser üzerine eklemek için ayarlar bölümüne \ngidin. \"Tor\"' üzerine tıklayıp, \"Bir köprü kullanılsın\" seçeneÄ?ini iÅ?aretleyerek \n\"Bir köprü adresi yazın\" alanına köprü adreslerini yazın ya da yapıÅ?tırın."
-#. 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 "Ä°nternet Hizmeti SaÄ?layıcınız (ISS) Tor aÄ?ına olan baÄ?lantıları engelliyor\nya da baÅ?ka Å?ekillerde bir sansür uyguluyor mu?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "(GizlenmemiÅ? Tor köprüleri iste)."
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "'Evet' seçip ardından 'Ä°leri' üzerine tıklayın. Yeni köprülerinizi ayarlamak için köprü\nsatırlarını kopyalayarak metin kutusuna yapıÅ?tırın.\n'BaÄ?lan' üzerine tıkladıÄ?ınızda artık hazırsınız! Sorun yaÅ?ıyorsanız, daha fazla yardım almak için 'Tor AÄ?ı Ayarları' yardımcısındaki 'Yardım' düÄ?mesine tıklamayı deneyin."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "Bu iletiyi görüntüler."
-
-#. 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 "Normal köprüler iste."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "IPv6 köprüleri iste."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "TYPE uyumlu bir DeÄ?iÅ?tirilebilir TaÅ?ıyıcı iste."
+msgid "(Request IPv6 bridges.)"
+msgstr "(IPv6 köprüleri iste)."
-#. 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 "Herkese açık BridgeDB GnuPG anahtarının bir kopyasını al."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "(GizlenmiÅ? obfs4 köprüleri iste)."
diff --git a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
index 7edd38e..8c07a2b 100644
--- a/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/uk/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>, 2019
@@ -15,116 +15,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-04-05 23:58+0000\n"
-"Last-Translator: Bogdan Kulynych <bogdan.kulynych@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: uk\n"
"Plural-Forms: nplurals=4; plural=(n % 1 == 0 && n % 10 == 1 && n % 100 != 11 ? 0 : n % 1 == 0 && n % 10 >= 2 && n % 10 <= 4 && (n % 100 < 12 || n % 100 > 14) ? 1 : n % 1 == 0 && (n % 10 ==0 || (n % 10 >=5 && n % 10 <=9) || (n % 100 >=11 && n % 100 <=14 )) ? 2: 3);\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Ð?и пÑ?иноÑ?имо наÑ?Ñ? вибаÑ?еннÑ?! ЩоÑ?Ñ? пÑ?Ñ?ло не Ñ?ак з Ð?аÑ?им запиÑ?ом."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ð?ова"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Ð?овÑ?домиÑ?и пÑ?о помилкÑ?"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "Ð?од"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "СпиÑ?ок змÑ?н"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Ð?онÑ?акÑ?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ð?ибÑ?аÑ?и вÑ?Ñ?"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "Ð?оказаÑ?и QR-код"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "Ð?даÑ?Ñ?Ñ?Ñ?Ñ?, Ñ?о Ñ?Ñ?алаÑ?Ñ? помилка пÑ?и оÑ?Ñ?иманнÑ? ваÑ?ого QR-кодÑ?."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Ð? даний Ñ?аÑ? немаÑ? доÑ?Ñ?Ñ?пниÑ? моÑ?Ñ?Ñ?в..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "Ð?Ñ?ок %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "Ð?аванÑ?ажиÑ?и %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "Ð?Ñ?ок %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "Ð?Ñ?Ñ?имайÑ?е %s моÑ?Ñ?и %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "Ð?Ñ?ок %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ТепеÑ? %s додай bridges до Tor Browser %s"
@@ -133,27 +148,27 @@ msgstr "ТепеÑ? %s додай bridges до Tor Browser %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sТ%sÑ?лÑ?ки дай менÑ? моÑ?Ñ?и!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "РозÑ?иÑ?енÑ? Ð?аÑ?амеÑ?Ñ?и"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Ð?Ñ?"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "жоден"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sТ%sак!"
@@ -161,69 +176,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sÐ?%sÑ?Ñ?имаÑ?и моÑ?Ñ?и"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Це авÑ?омаÑ?иÑ?не повÑ?домленнÑ?; бÑ?дÑ? лаÑ?ка, не вÑ?дповÑ?дайÑ?е.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Ð?аÑ?Ñ? моÑ?Ñ?и:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 годин. Ð?Ñ?Ñ? подалÑ?Ñ?Ñ? лиÑ?Ñ?и в Ñ?ей пеÑ?Ñ?од Ñ?аÑ?Ñ? бÑ?дÑ?Ñ?Ñ? Ñ?гноÑ?Ñ?ваÑ?иÑ?Ñ?."
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "Ð?оманди: (комбÑ?нÑ?ваÑ?и команди вказавÑ?и кÑ?лÑ?ка ваÑ?Ñ?анÑ?Ñ?в одноÑ?аÑ?но)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "Ð?аÑ?каво пÑ?оÑ?имо Ñ? BridgeDB!"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "У даний Ñ?аÑ? пÑ?дÑ?Ñ?имÑ?Ñ?Ñ?Ñ?Ñ?Ñ? transport TYPE:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "Ð?Ñ?ивÑ?Ñ?, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Ð?Ñ?ивÑ?Ñ?, дÑ?Ñ?же!"
-
-#: 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."
-#: 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."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -234,7 +217,7 @@ msgid ""
msgstr "BridgeDB може забезпеÑ?иÑ?и моÑ?Ñ?и з декÑ?лÑ?кома %sÑ?ипами вÑ?Ñ?авниÑ? Ñ?Ñ?анÑ?поÑ?Ñ?еÑ?Ñ?в%s,\nÑ?кÑ? можÑ?Ñ?Ñ? допомогÑ?и пÑ?иÑ?оваÑ?и Ñ?воÑ? зв'Ñ?зки з меÑ?ежеÑ? Tor, Ñ?о Ñ?Ñ?кладнÑ?Ñ? Ñ?обоÑ?Ñ?\nдлÑ? Ñ?иÑ?, Ñ?Ñ?о пеÑ?евÑ?Ñ?Ñ?Ñ? Ð?аÑ? Ñ?нÑ?еÑ?неÑ?-Ñ?Ñ?аÑ?Ñ?к, Ñ?об визнаÑ?иÑ?и, Ñ?о Ð?и\nвикоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?е Tor. \n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -246,7 +229,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -255,134 +238,169 @@ msgid ""
"\n"
msgstr "Ð?Ñ?Ñ?м Ñ?ого, BridgeDB маÑ? багаÑ?о пÑ?оÑ?Ñ?иÑ? Ñ?к двеÑ?Ñ? моÑ?Ñ?Ñ?в %s без\nвÑ?Ñ?авниÑ? Ñ?Ñ?анÑ?поÑ?Ñ?еÑ?Ñ?в %s, Ñ?кÑ?, можливо, не звÑ?Ñ?аÑ?Ñ? гаÑ?но, але вони \nможÑ?Ñ?Ñ? допомогÑ?и обÑ?йÑ?и Ñ?нÑ?еÑ?неÑ?-Ñ?ензÑ?Ñ?Ñ? в багаÑ?Ñ?оÑ? випадкаÑ?.\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "Що Ñ?аке Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ? Ñ?ипÑ? мÑ?Ñ?Ñ??"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s Ð?оÑ?Ñ?и %s Ñ? Tor Ñ?еле, Ñ?кÑ? допоможÑ?Ñ?Ñ? Ð?ам обÑ?йÑ?и Ñ?ензÑ?Ñ?Ñ?."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "Ð?енÑ? поÑ?Ñ?Ñ?бен алÑ?Ñ?еÑ?наÑ?ивний Ñ?поÑ?Ñ?б оÑ?Ñ?иманнÑ? Ñ?пиÑ?кÑ? моÑ?Ñ?Ñ?в!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "Ще один Ñ?поÑ?Ñ?б оÑ?Ñ?имаÑ?и bridges - Ñ?е вÑ?дпÑ?авиÑ?и лиÑ?Ñ? на адÑ?еÑ?Ñ? %s. Ð?веÑ?нÑ?Ñ?Ñ? Ñ?вагÑ?, Ñ?о\nÐ?и повиннÑ? надÑ?Ñ?лаÑ?и лиÑ?Ñ?, викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?и адÑ?еÑ?Ñ? вÑ?д одного з наÑ?Ñ?Ñ?пниÑ? поÑ?Ñ?аÑ?алÑ?никÑ?в\nпоÑ?лÑ?г елекÑ?Ñ?онноÑ? поÑ?Ñ?и:\n%s, %s або %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "Ð?оÑ? моÑ?Ñ?и не пÑ?аÑ?Ñ?Ñ?Ñ?Ñ?! Ð?опоможÑ?Ñ?Ñ?!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "ЯкÑ?о Ð?аÑ? Tor не пÑ?аÑ?Ñ?Ñ?, Ð?и можеÑ?е вÑ?дпÑ?авиÑ?и нам елекÑ?Ñ?онного лиÑ?Ñ?а %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "СпÑ?обÑ?йÑ?е додаÑ?и Ñ?кнайбÑ?лÑ?Ñ?е Ñ?нÑ?оÑ?маÑ?Ñ?Ñ? пÑ?о Ð?аÑ? випадок, в Ñ?омÑ? Ñ?иÑ?лÑ? Ñ?пиÑ?ок\nмоÑ?Ñ?Ñ?в Ñ? вÑ?Ñ?авниÑ? Ñ?Ñ?анÑ?поÑ?Ñ?еÑ?Ñ?в, Ñ?кÑ? Ð?и пÑ?обÑ?вали викоÑ?иÑ?Ñ?овÑ?ваÑ?и, веÑ?Ñ?Ñ?Ñ? бÑ?аÑ?зеÑ?а Tor,\nÑ? бÑ?дÑ?-Ñ?кÑ? повÑ?домленнÑ?, Ñ?кÑ? Tor видавав, Ñ? Ñ?.д."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "Ð?Ñ?нÑ?Ñ? длÑ? Ð?аÑ?ого моÑ?Ñ?Ñ?:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "Ð?Ñ?Ñ?имаÑ?и Bridges!"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?Ñ?Ñ?ого"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "Ð?Ñ?дÑ? лаÑ?ка, обеÑ?Ñ?Ñ?Ñ? паÑ?амеÑ?Ñ?и Ñ?ипÑ? мÑ?Ñ?Ñ?:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "Ð?ам поÑ?Ñ?Ñ?бнÑ? адÑ?еÑ?и IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "Ð?ам поÑ?Ñ?Ñ?бен %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "Ð?аÑ? бÑ?аÑ?зеÑ? не вÑ?добÑ?ажаÑ? зобÑ?аженнÑ? належним Ñ?ином."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Ð?ведÑ?Ñ?Ñ? зобÑ?аженнÑ? Ñ?имволи ..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "Як поÑ?аÑ?и коÑ?иÑ?Ñ?Ñ?ваÑ?иÑ?Ñ? Ð?аÑ?ими моÑ?Ñ?ами"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Щоб додаÑ?и Ñ?еÑ?Ñ?анÑ?лÑ?Ñ?оÑ?и Ñ? Tor Browser, Ñ?поÑ?аÑ?кÑ? Ñ?дÑ?Ñ?Ñ? на %s Ñ?Ñ?оÑ?Ñ?нкÑ? заванÑ?аженнÑ? Tor Browser %s а поÑ?Ñ?м Ñ?лÑ?дÑ?йÑ?е Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?Ñ?м длÑ? Ñ?каÑ?Ñ?ваннÑ? Ñ? запÑ?Ñ?кÑ? Tor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Ð?оли дÑ?алог \"Ð?алаÑ?Ñ?Ñ?ваннÑ? меÑ?ежÑ? Tor\" вÑ?дкÑ?иÑ?Ñ?Ñ?Ñ?Ñ?, наÑ?иÑ?нÑ?Ñ?Ñ? \"Ð?алаÑ?Ñ?Ñ?ваÑ?и\" Ñ? доÑ?Ñ?имÑ?йÑ?еÑ?Ñ?\nпÑ?дказкам майÑ?Ñ?Ñ?а, допоки вÑ?н не запÑ?оÑ?иÑ?Ñ?:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "Ð?аÑ?Ñ?й Ñ?нÑ?еÑ?неÑ?-пÑ?овайдеÑ? (ISP) блокÑ?Ñ? або Ñ?ензÑ?Ñ?Ñ?Ñ? з'Ñ?днаннÑ?\nдо меÑ?ежÑ? Tor?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "Ð?ибеÑ?Ñ?Ñ?Ñ? \"Так\", а поÑ?Ñ?м наÑ?иÑ?нÑ?Ñ?Ñ? \"Ð?алÑ?\". Ð?лÑ? налаÑ?Ñ?Ñ?ваннÑ? новиÑ? bridges, Ñ?копÑ?Ñ?йÑ?е Ñ?\nвÑ?Ñ?авÑ?е лÑ?нÑ?Ñ? bridge Ñ? поле длÑ? введеннÑ? Ñ?екÑ?Ñ?Ñ?. Ð?оÑ?Ñ?м, наÑ?иÑ?нÑ?Ñ?Ñ? 'Ð?Ñ?дклÑ?Ñ?аÑ?иÑ?Ñ?', Ñ?\nвÑ?е повинно пÑ?аÑ?Ñ?ваÑ?и! ЯкÑ?о Ñ? Ð?аÑ? виникли пÑ?облеми, Ñ?пÑ?обÑ?йÑ?е наÑ?иÑ?нÑ?Ñ?и \"Ð?овÑ?дка\" \nв майÑ?Ñ?Ñ?овÑ? \"Ð?еÑ?ежевÑ? паÑ?амеÑ?Ñ?и Tor' длÑ? оÑ?Ñ?иманнÑ? додаÑ?ковоÑ? допомоги."
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "Ð?апиÑ? на оÑ?Ñ?иманнÑ? vanilla bridges."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Ð?апиÑ? на оÑ?Ñ?иманнÑ? IPv6 bridges."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Ð?апиÑ? на оÑ?Ñ?иманнÑ? Pluggable Transport по TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Ð?Ñ?Ñ?имаÑ?и копÑ?Ñ? вÑ?дкÑ?иÑ?ого GnuPG клÑ?Ñ?а длÑ? BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..cbafe76
--- /dev/null
+++ b/bridgedb/i18n/ur/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,399 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Ali Kamran <kamran@xxxxxxxxxxxxxxxxxxxxxxxxxx>, 2019
+# Muhammad Sohaib Raza <sohaibraza000@xxxxxxxxx>, 2016
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-02-04 10:59-0800\n"
+"PO-Revision-Date: 2020-02-05 01:11+0000\n"
+"Last-Translator: carolyn <carolyn@xxxxxxxxxx>\n"
+"Language-Team: Urdu (http://www.transifex.com/otf/torproject/language/ur/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Generated-By: Babel 2.7.0\n"
+"Language: ur\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs2"
+#. "obfs3"
+#. "scramblesuit"
+#. "fteproxy"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:138
+msgid "Sorry! Something went wrong with your request."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "زباÙ?"
+
+#: bridgedb/distributors/https/templates/base.html:92
+msgid "Report a Bug"
+msgstr "Ù?سئÙ?Û? رپÙ?رٹ کرÛ?Úº"
+
+#: bridgedb/distributors/https/templates/base.html:95
+msgid "Source Code"
+msgstr "سÙ?رس Ú©Ù?Ú?"
+
+#: bridgedb/distributors/https/templates/base.html:98
+msgid "Changelog"
+msgstr "Ù?اگ تبدÛ?Ù? کرÛ?Úº"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "تÙ?اÙ? Ù?Ù?تخب کرÛ?Úº."
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR Ú©Ù?Ú? ظاÛ?ر کرÛ?ÚºÛ?"
+
+#: bridgedb/distributors/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/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
+msgid "Uh oh, spaghettios!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+msgid "It seems there was an error getting your QRCode."
+msgstr ""
+
+#: bridgedb/distributors/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/distributors/https/templates/bridges.html:131
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:133
+#: bridgedb/distributors/https/templates/bridges.html:137
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, 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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Ù?زÛ?د اÙ?تخاباتÛ?"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Ù?Û?Û?Úº"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "Ú©Ù?ئÛ? Ù?Û?Û?Úº"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, python-format
+msgid "%sY%ses!"
+msgstr ""
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
+#. beginning of words are present in your final translation. Thanks!
+#. TRANSLATORS: Please do NOT translate the word "bridge"!
+#: bridgedb/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:43
+msgid "[This is an automated message; please do not reply.]"
+msgstr "[Û?Û? اÛ?Ú© Ø®Ù?دکار Ù¾Û?غاÙ? Û?Û?: براÛ? Ù?Û?رباÙ?Û? جÙ?اب Ù?Û? دÛ?جÛ?Û?]"
+
+#: bridgedb/strings.py:45
+msgid "Here are your bridges:"
+msgstr ""
+
+#: 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 ""
+
+#: bridgedb/strings.py:50
+msgid ""
+"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
+#: bridgedb/strings.py:53
+msgid "Welcome to BridgeDB!"
+msgstr "BridgeDB Ù?Û?Úº Ø®Ù?Ø´ اÙ?Ù?دÛ?د"
+
+#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
+#: bridgedb/strings.py:55
+msgid "Currently supported transport TYPEs:"
+msgstr ""
+
+#: bridgedb/strings.py:56
+#, python-format
+msgid "Hey, %s!"
+msgstr "Û?Û?Ù?Ù? Ø? %s"
+
+#: bridgedb/strings.py:57
+msgid "Hello, friend!"
+msgstr "Û?Û?Ù?Ù? دÙ?ستÙ?!"
+
+#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58
+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."
+#: bridgedb/strings.py:62
+#, python-format
+msgid ""
+"This email was generated with rainbows, unicorns, and sparkles\n"
+"for %s on %s at %s."
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:72
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:79
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:88
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+msgid "What are bridges?"
+msgstr ""
+
+#: bridgedb/strings.py:102
+#, python-format
+msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:117
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:121
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:125
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:126
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:130
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:131
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:132
+#, python-format
+msgid "Do you need a %s?"
+msgstr "Ú©Û?ا اÙ?Ù¾ Ú©Ù? اÛ?Ú© %s Ú?ائÛ?Û? Ø?"
+
+#: bridgedb/strings.py:136
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:141
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:143
+#, python-format
+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 ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:148
+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".
+#: bridgedb/strings.py:152
+msgid ""
+"Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
+"to the Tor network?"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor".
+#: bridgedb/strings.py:156
+msgid ""
+"Select 'Yes' and then click 'Next'. To configure your new bridges, copy and\n"
+"paste the bridge lines into the text input box. Finally, click 'Connect', and\n"
+"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
+"button in the 'Tor Network Settings' wizard for further assistance."
+msgstr ""
+
+#: bridgedb/strings.py:164
+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.
+#: bridgedb/strings.py:168
+msgid "Request vanilla bridges."
+msgstr ""
+
+#: bridgedb/strings.py:169
+msgid "Request IPv6 bridges."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
+#: bridgedb/strings.py:171
+msgid "Request a Pluggable Transport by TYPE."
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: Please DO NOT translate "GnuPG".
+#: bridgedb/strings.py:174
+msgid "Get a copy of BridgeDB's public GnuPG key."
+msgstr ""
diff --git a/bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po
new file mode 100644
index 0000000..2764f6e
--- /dev/null
+++ b/bridgedb/i18n/uz/LC_MESSAGES/bridgedb.po
@@ -0,0 +1,401 @@
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
+#
+# Translators:
+# Akmal <uzbadmin@xxxxxxxxx>, 2018
+# Shuhrat Dehkanov <k+transifex@xxxxxxx>, 2014
+# U A <u.almasov@xxxxxxxxx>, 2013
+msgid ""
+msgstr ""
+"Project-Id-Version: Tor 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: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 2.8.0\n"
+"Language: uz\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
+#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
+#. any string (regardless of capitalization and/or punctuation):
+#. "BridgeDB"
+#. "pluggable transport"
+#. "pluggable transports"
+#. "obfs4"
+#. "Tor"
+#. "Tor Browser"
+#: bridgedb/distributors/https/server.py:154
+msgid "Sorry! Something went wrong with your request."
+msgstr "Uzr, nimadir xato ketdi."
+
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Til"
+
+#: bridgedb/distributors/https/templates/base.html:94
+msgid "Report a Bug"
+msgstr "Nosozlik haqida xabar berish"
+
+#: bridgedb/distributors/https/templates/base.html:97
+msgid "Source Code"
+msgstr "Kod"
+
+#: bridgedb/distributors/https/templates/base.html:100
+msgid "Changelog"
+msgstr "Oʻzgarishlar"
+
+#: bridgedb/distributors/https/templates/bridges.html:35
+msgid "Select All"
+msgstr "Barchasini belgilash"
+
+#: bridgedb/distributors/https/templates/bridges.html:40
+msgid "Show QRCode"
+msgstr "QR kodni koʻrsatish"
+
+#: bridgedb/distributors/https/templates/bridges.html:52
+msgid "QRCode for your bridge lines"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:63
+msgid "It seems there was an error getting your QRCode."
+msgstr "QR kod olinmadi"
+
+#: bridgedb/distributors/https/templates/bridges.html:68
+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/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
+msgid "There currently aren't any bridges available..."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
+#, python-format
+msgid ""
+" Perhaps you should try %s going back %s and choosing a different bridge "
+"type!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:11
+#, python-format
+msgid "Step %s1%s"
+msgstr "%s1%s-bosqich"
+
+#: bridgedb/distributors/https/templates/index.html:13
+#, python-format
+msgid "Download %s Tor Browser %s"
+msgstr " %s Tor brauzeri %sni yuklab olish"
+
+#: bridgedb/distributors/https/templates/index.html:25
+#, python-format
+msgid "Step %s2%s"
+msgstr "%s2%s-bosqich"
+
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
+#, python-format
+msgid "Get %s bridges %s"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/index.html:40
+#, python-format
+msgid "Step %s3%s"
+msgstr "%s3%s-qadam"
+
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
+#, 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/distributors/https/templates/options.html:42
+#, python-format
+msgid "%sJ%sust give me bridges!"
+msgstr ""
+
+#: bridgedb/distributors/https/templates/options.html:55
+msgid "Advanced Options"
+msgstr "Ilg'or moslamalar"
+
+#: bridgedb/distributors/https/templates/options.html:93
+msgid "No"
+msgstr "Yoʻq"
+
+#: bridgedb/distributors/https/templates/options.html:94
+msgid "none"
+msgstr "yoʻq"
+
+#. TRANSLATORS: Please make sure the '%s' surrounding single 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/distributors/https/templates/options.html:131
+#, 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/distributors/https/templates/options.html:154
+#, python-format
+msgid "%sG%set Bridges"
+msgstr ""
+
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
+
+#: bridgedb/strings.py:35
+msgid "Here are your bridges:"
+msgstr "Ko'priklaringiz:"
+
+#: bridgedb/strings.py:37
+#, python-format
+msgid ""
+"You have exceeded the rate limit. Please slow down! The minimum time between\n"
+"emails is %s hours. All further emails during this time period will be ignored."
+msgstr ""
+
+#: bridgedb/strings.py:40
+msgid ""
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
+
+#. 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".
+#: bridgedb/strings.py:50
+#, python-format
+msgid ""
+"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
+"which can help obfuscate your connections to the Tor Network, making it more\n"
+"difficult for anyone watching your internet traffic to determine that you are\n"
+"using Tor.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
+#: bridgedb/strings.py:57
+msgid ""
+"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
+"Transports aren't IPv6 compatible.\n"
+"\n"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB".
+#. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
+#. regular, or unexciting". Like vanilla ice cream. It refers to bridges
+#. which do not have Pluggable Transports, and only speak the regular,
+#. boring Tor protocol. Translate it as you see fit. Have fun with it.
+#: bridgedb/strings.py:66
+#, python-format
+msgid ""
+"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
+"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
+"help to circumvent internet censorship in many cases.\n"
+"\n"
+msgstr ""
+
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
+msgid "What are bridges?"
+msgstr "Ko'priklar nima?"
+
+#: bridgedb/strings.py:79
+#, 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."
+
+#: bridgedb/strings.py:84
+msgid "I need an alternative way of getting bridges!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
+#, python-format
+msgid ""
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
+
+#: bridgedb/strings.py:94
+msgid "My bridges don't work! I need help!"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
+msgid ""
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
+
+#: bridgedb/strings.py:102
+msgid "Here are your bridge lines:"
+msgstr ""
+
+#: bridgedb/strings.py:103
+msgid "Get Bridges!"
+msgstr ""
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Ð?еÑ?"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
+msgid "Please select options for bridge type:"
+msgstr ""
+
+#: bridgedb/strings.py:149
+msgid "Do you need IPv6 addresses?"
+msgstr ""
+
+#: bridgedb/strings.py:150
+#, python-format
+msgid "Do you need a %s?"
+msgstr ""
+
+#: bridgedb/strings.py:154
+msgid "Your browser is not displaying images properly."
+msgstr ""
+
+#: bridgedb/strings.py:155
+msgid "Enter the characters from the image above..."
+msgstr ""
+
+#: bridgedb/strings.py:159
+msgid "How to start using your bridges"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "Tor Browser".
+#: bridgedb/strings.py:161
+#, python-format
+msgid ""
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
+
+#: bridgedb/strings.py:166
+msgid ""
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
+
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:174
+msgid "(Request IPv6 bridges.)"
+msgstr ""
+
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po
index 39c5813..cf4d71b 100644
--- a/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/vi/LC_MESSAGES/bridgedb.po
@@ -1,9 +1,10 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Acooldude, 2016
+# Ä?ức Phạm Minh <phamducvn.0308@xxxxxxxxx>, 2019
# Khanh Nguyen <nguyenduykhanh85@xxxxxxxxx>, 2015-2016
# Gary, 2016
# Ngo Long <ngotienlong1996@xxxxxxxxx>, 2018
@@ -12,145 +13,160 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-07-19 14:23+0000\n"
-"Last-Translator: Ngo Long <ngotienlong1996@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: vi\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "Xin lá»?i! Có gì Ä?ó không Ä?úng vá»?i yêu cầu của bạn."
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "Ngôn ngữ"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "Báo cáo l�i"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "MaÌ? NguôÌ?n"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "Nháºt ký thay Ä?ôÌ?i"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Liên hệ"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "Ch�n Tất cả"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "HiêÌ?n thiÌ£ MaÌ? QR"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
msgid "QRCode for your bridge lines"
-msgstr "MaÌ? QR cho caÌ?c Ä?Æ°á»?ng cầu ná»?i cuÌ?a baÌ£n"
-
-#. 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
+msgstr "MaÌ? QR cho caÌ?c bridge cuÌ?a baÌ£n"
+
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "CoÌ? veÌ? nhÆ° có lá»?i khi Ä?ang lấy mã QR của bạn."
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
msgid ""
"This QRCode contains your bridge lines. Scan it with a QRCode reader to copy"
" your bridge lines onto mobile and other devices."
msgstr "MaÌ? QR chÆ°Ì?a những Ä?Æ°á»?ng cầu ná»?i cuÌ?a baÌ£n. Quét noÌ? bÄ?Ì?ng một triÌ?nh Ä?oÌ£c maÌ? QR vaÌ? sao cheÌ?p những Ä?Æ°á»?ng cầu ná»?i lên Ä?iện thoaÌ£i vaÌ? caÌ?c thiêÌ?t biÌ£ khaÌ?c."
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "Hi�n không có sẵn cầu n�i nà o..."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, python-format
msgid ""
" Perhaps you should try %s going back %s and choosing a different bridge "
"type!"
msgstr "CoÌ? leÌ? baÌ£n nên thÆ°Ì? %s quay laÌ£i %s vaÌ? choÌ£n một loaÌ£i cầu ná»?i khaÌ?c!"
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "BÆ°Æ¡Ì?c %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "TaÌ?i xuôÌ?ng %s Tor Browser %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "BÆ°Æ¡Ì?c %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
-msgstr "Chọn %sbridges%s"
+msgstr "Lấy %s cầu n�i %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
-msgstr "BÆ°Æ¡Ì?c %s3%s"
+msgstr "BÆ°Æ¡Ì?c %s 3 %s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Bây giÆ¡Ì? thiÌ? %s thêm bridges Ä?oÌ? vaÌ?o Tor Browser %s"
+msgstr "Bây giÆ¡Ì? thiÌ? %s thêm những cầu ná»?i Ä?ó Ä?oÌ? vaÌ?o 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
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sC%shiÌ? câÌ?n Ä?Æ°a cho tôi bridges!"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "CaÌ?c TuÌ?y ChoÌ£n Nâng Cao"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "Không"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "rôÌ?ng"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sV%sâng!"
@@ -158,69 +174,37 @@ msgstr "%sV%sâng!"
#. TRANSLATORS: Please make sure the '%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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sL%sâÌ?y Bridges"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[Ä?ây laÌ? tin nhÄ?Ì?n tá»± Ä?á»?ng; xin Ä?ừng trả lá»?i.]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "Bridges cuÌ?a baÌ£n Ä?ây:"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate limit. Please slow down! The minimum time between\n"
"emails is %s hours. All further emails during this time period will be ignored."
msgstr "BaÌ£n Ä?aÌ? vÆ°Æ¡Ì£t quaÌ? giÆ¡Ì?i haÌ£n tôÌ?c Ä?ộ. CÆ°Ì? tÆ°Ì? tÆ°Ì? thôi! KhoaÌ?ng thÆ¡Ì?i gian daÌ?n caÌ?ch giÆ°Ì?a caÌ?c email laÌ? %s tiêÌ?ng Ä?ôÌ?ng hôÌ?. TâÌ?t caÌ? caÌ?c email khaÌ?c trong khoaÌ?ng thÆ¡Ì?i gian naÌ?y Ä?êÌ?u seÌ? biÌ£ boÌ? qua."
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "CaÌ?c LÃ?Ì£NH: (kêÌ?t hÆ¡Ì£p Ä?ôÌ?ng thÆ¡Ì?i nhiêÌ?u LÃ?Ì£NH Ä?êÌ? chiÌ? Ä?iÌ£nh nhiêÌ?u lÆ°Ì£a choÌ£n)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: 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".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "CaÌ?c transport TYPE Ä?ược há»? trợ hiá»?n thá»?i:"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "NaÌ?y, %s!"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "Chà o bạn!"
-
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
-msgid "Public Keys"
-msgstr "Khóa công khai"
-
-#. 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "Email nà y Ä?ược tạo bá»?i cầu vá»?ng, kỳ lân và ánh sáng lấp lánh cho %s và o %s luÌ?c %s."
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -228,10 +212,10 @@ msgid ""
"difficult for anyone watching your internet traffic to determine that you are\n"
"using Tor.\n"
"\n"
-msgstr "BridgeDB coÌ? thêÌ? cung câÌ?p caÌ?c Ä?Æ°Æ¡Ì?ng kêÌ?t nôÌ?i vÆ¡Ì?i nhiêÌ?u %sloaÌ£i Pluggable Transports%s,\nchuÌ?ng coÌ? thêÌ? giuÌ?p che giâÌ?u Ä?Æ°Æ¡Ì?ng truyêÌ?n cuÌ?a baÌ£n Ä?êÌ?n MaÌ£ng LÆ°Æ¡Ì?i Tor, laÌ?m Ä?Æ°Æ¡Ì?ng truyêÌ?n\ninternet cuÌ?a baÌ£n khoÌ? biÌ£ ngÆ°Æ¡Ì?i khaÌ?c theo doÌ?i hÆ¡n Ä?êÌ? xaÌ?c Ä?iÌ£nh baÌ£n coÌ? Ä?ang sÆ°Ì? duÌ£ng Tor\nhay không.\n\n"
+msgstr "BridgeDB coÌ? thêÌ? cung câÌ?p caÌ?c Ä?Æ°á»?ng cầu ná»?i vÆ¡Ì?i nhiêÌ?u %sloaÌ£i Pluggable Transports%s,\nchuÌ?ng coÌ? thêÌ? giuÌ?p che giâÌ?u Ä?Æ°Æ¡Ì?ng truyêÌ?n cuÌ?a baÌ£n Ä?êÌ?n MaÌ£ng LÆ°Æ¡Ì?i Tor, laÌ?m Ä?Æ°Æ¡Ì?ng truyêÌ?n\ninternet cuÌ?a baÌ£n khoÌ? biÌ£ ngÆ°Æ¡Ì?i khaÌ?c theo doÌ?i hÆ¡n Ä?êÌ? xaÌ?c Ä?iÌ£nh baÌ£n coÌ? Ä?ang sÆ°Ì? duÌ£ng Tor\nhay không.\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -243,143 +227,178 @@ msgstr "Má»?t và i Ä?Æ°Æ¡Ì?ng kêÌ?t nôÌ?i vá»?i Ä?á»?a chá»? IPv6 cÅ©ng Ä?ang
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
"Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
"help to circumvent internet censorship in many cases.\n"
"\n"
-msgstr "Thêm vaÌ?o Ä?oÌ?, BridgeDB coÌ? râÌ?t nhiêÌ?u bridge nguyên gôÌ?c %s tÆ°Ì?c laÌ? nhÆ°Ì?ng bridge\nkhông coÌ? Pluggable Transports naÌ?o %s vaÌ? Ä?iêÌ?u Ä?oÌ? nghe coÌ? veÌ? không tôÌ?t cho\nlÄ?Ì?m, nhÆ°ng chuÌ?ng coÌ? thêÌ? vâÌ?n giuÌ?p traÌ?nh caÌ?c sÆ°Ì£ kiêÌ?m duyệt internet trong nhiêÌ?u\ntrÆ°Æ¡Ì?ng hÆ¡Ì£p.\n\n"
+msgstr "Thêm vaÌ?o Ä?oÌ?, BridgeDB coÌ? râÌ?t nhiêÌ?u cầu ná»?i tầm thÆ°á»?ng %s tÆ°Ì?c laÌ? nhÆ°Ì?ng bridge\nkhông coÌ? Pluggable Transports naÌ?o %s vaÌ? Ä?iêÌ?u Ä?oÌ? nghe coÌ? veÌ? không tôÌ?t cho\nlÄ?Ì?m, nhÆ°ng chuÌ?ng coÌ? thêÌ? vâÌ?n giuÌ?p traÌ?nh caÌ?c sÆ°Ì£ kiêÌ?m duyệt internet trong nhiêÌ?u\ntrÆ°Æ¡Ì?ng hÆ¡Ì£p.\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
-msgstr "Bridges laÌ? giÌ??"
+msgstr "Cầu ná»?i laÌ? giÌ??"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Bridges %s laÌ? nhÆ°Ì?ng sÆ°Ì£ ngÆ°ng trệ cuÌ?a Tor -Tor relays- nhÄ?Ì?m giuÌ?p traÌ?nh neÌ? sÆ°Ì£ kiêÌ?m duyệt."
+msgstr "%s Cầu ná»?i %s laÌ? nhÆ°Ì?ng sá»± tiếp ná»?i của mạng Tor -Tor relays- nhÄ?Ì?m giuÌ?p traÌ?nh neÌ? sÆ°Ì£ kiêÌ?m duyệt."
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
-msgstr "Tôi câÌ?n một caÌ?ch khaÌ?c Ä?êÌ? lâÌ?y bridges!"
+msgstr "Tôi câÌ?n một caÌ?ch khaÌ?c Ä?êÌ? lâÌ?y cầu ná»?i!"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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 "CaÌ?ch khaÌ?c Ä?êÌ? lâÌ?y bridges laÌ? gÆ°Ì?i một email tÆ¡Ì?i %s. HaÌ?y lÆ°u yÌ? rÄ?Ì?ng baÌ£n phaÌ?i gÆ°Ì?i một email\nsÆ°Ì? duÌ£ng Ä?iÌ?a chiÌ? tÆ°Ì? một trong nhÆ°Ì?ng nhaÌ? cung câÌ?p email sau:\n%s, %s hoÄ?Ì£c %s."
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
-msgstr "Bridges cuÌ?a tôi không hoaÌ£t Ä?ộng! Tôi câÌ?n giuÌ?p Ä?Æ¡Ì?!"
+msgstr "Cầu ná»?i cuÌ?a tôi không hoaÌ£t Ä?ộng! Tôi câÌ?n giuÌ?p Ä?Æ¡Ì?!"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "NêÌ?u Tor cuÌ?a baÌ£n không hoaÌ£t Ä?ộng, baÌ£n nên gÆ°Ì?i email cho %s."
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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á»?,\nbao gá»?m danh sách những bridges vaÌ? Pluggable Transports baÌ£n Ä?aÌ? thÆ°Ì? sÆ°Ì?\nduÌ£ng, phiên bản của Tor Browser, và bất kỳ thông Ä?iá»?p nà o mà Tor Ä?Æ°a ra\ncho baÌ£n, v.v..."
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "Nếu trình duy�t Tor Browser của bạn không th� kết n�i, xin hãy xem xét %s và %s của chúng tôi."
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
-msgstr "Bridge lines cuÌ?a baÌ£n Ä?ây:"
+msgstr "Cầu ná»?i cuÌ?a baÌ£n Ä?ây:"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
-msgstr "LâÌ?y Bridges!"
+msgstr "LâÌ?y Cầu ná»?i!"
+
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "Không có"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
-msgstr "HaÌ?y choÌ£n caÌ?c tuÌ?y choÌ£n cho bridge type:"
+msgstr "HaÌ?y choÌ£n caÌ?c tuÌ?y choÌ£n cho loại cầu ná»?i:"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "BaÌ£n coÌ? câÌ?n caÌ?c Ä?iÌ£a chiÌ? IPv6?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "BaÌ£n coÌ? câÌ?n một %s?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
-msgstr "TriÌ?nh duyệt cuÌ?a baÌ£n không hiêÌ?u thiÌ£ hiÌ?nh aÌ?nh chiÌ?nh xaÌ?c."
+msgstr "TriÌ?nh duyệt cuÌ?a baÌ£n Ä?ang không hiêÌ?u thiÌ£ hiÌ?nh aÌ?nh chiÌ?nh xaÌ?c."
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "Nhập caÌ?c kyÌ? tÆ°Ì£ tÆ°Ì? hiÌ?nh aÌ?nh Æ¡Ì? trên..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
-msgstr "LaÌ?m sao Ä?êÌ? bÄ?Ì?t Ä?âÌ?u sÆ°Ì? duÌ£ng bridges cuÌ?a baÌ£n"
+msgstr "LaÌ?m sao Ä?êÌ? bÄ?Ì?t Ä?âÌ?u sÆ°Ì? duÌ£ng cầu ná»?i cuÌ?a baÌ£n"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "Ä?êÌ? nhập bridges vaÌ?o Tor Browser, Ä?âÌ?u tiên Ä?i Ä?êÌ?n %s trang taÌ?i xuôÌ?ng cuÌ?a\nTor Browser %s vaÌ? sau Ä?oÌ? laÌ?m theo hÆ°Æ¡Ì?ng dâÌ?n Æ¡Ì? Ä?oÌ? Ä?êÌ? taÌ?i xuôÌ?ng vaÌ? bÄ?Ì?t Ä?âÌ?u\nTor Browser."
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "Khi hộp thoaÌ£i 'TuÌ?y chiÌ?nh Tor Network' xuâÌ?t hiện, bấm chuá»?t vaÌ?o 'CâÌ?u hiÌ?nh' vaÌ? laÌ?m theo\ntriÌ?nh hÆ°Æ¡Ì?ng dâÌ?n Ä?êÌ?n khi noÌ? hoÌ?i:"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "CoÌ? phaÌ?i nhaÌ? Cung CâÌ?p DiÌ£ch VuÌ£ Internet (ISP) cuÌ?a baÌ£n Ä?aÌ? khoÌ?a hoÄ?Ì£c kiêÌ?m duyệt caÌ?c kêÌ?t nôÌ?i Ä?êÌ?n Tor network?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "ChoÌ£n 'Ä?uÌ?ng' vaÌ? sau Ä?oÌ? nhâÌ?n 'TiêÌ?p theo'. Ä?êÌ? câÌ?u hiÌ?nh bridges mÆ¡Ì?i cuÌ?a baÌ£n, sao cheÌ?p vaÌ? daÌ?n bridge lines vaÌ?o hộp nhập vÄ?n baÌ?n. CuôÌ?i cuÌ?ng, nhâÌ?n 'KêÌ?t nôÌ?i', vaÌ? baÌ£n Ä?aÌ? hoaÌ?n thaÌ?nh rôÌ?i Ä?âÌ?y! NêÌ?u baÌ£n gÄ?Ì£p rÄ?Ì?c rôÌ?i khi traÌ?i nghiệm, haÌ?y thÆ°Ì? nhâÌ?n nuÌ?t 'GiuÌ?p Ä?Æ¡Ì?' trong triÌ?nh hÆ°Æ¡Ì?ng dâÌ?n 'CaÌ?c TuÌ?y ChiÌ?nh Tor Network' Ä?êÌ? nhận Ä?Æ°Æ¡Ì£c sÆ°Ì£ giuÌ?p Ä?Æ¡Ì? tôÌ?t hÆ¡n."
-
-#: bridgedb/strings.py:167
-msgid "Displays this message."
-msgstr "HiêÌ?n thiÌ£ tin nhÄ?Ì?n naÌ?y."
-
-#. 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 "Yêu câÌ?u bridges nguyên gôÌ?c."
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "Yêu câÌ?u bridges cho IPv6."
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "Yêu cầu m�t Pluggable Transport by TYPE."
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "Lấy một baÌ?n sao của chiÌ?a khóa GnuPG công cá»?ng cuÌ?a BridgeDB."
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
index f55dd34..20d797d 100644
--- a/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_CN/LC_MESSAGES/bridgedb.po
@@ -1,134 +1,152 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# khi, 2013
# khi, 2013
# khi, 2013
-# Christopher Meng <i@xxxxxxxx>, 2012
+# Christopher M <i@xxxxxxxx>, 2012
+# Cloud P <heige.pcloud@xxxxxxxxxxx>, 2019
+# ff98sha, 2019-2020
# hanl <iamh4n@xxxxxxxxx>, 2011
# Meng San, 2014,2016
# leungsookfan <leung.sookfan@xxxxxxxxxx>, 2014
# Meng San, 2016
# Mingye Wang <arthur200126@xxxxxxxxx>, 2016
+# Scott Rhodes <starring169@xxxxxxxxx>, 2020
# khi, 2014-2015
# YFdyh000 <yfdyh000@xxxxxxxxx>, 2014-2015
-# Yikai Yang <ff98sha@xxxxxxxxx>, 2019
+# ff98sha, 2019
msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-05-30 00:43+0000\n"
-"Last-Translator: Yikai Yang <ff98sha@xxxxxxxxx>\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\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 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: zh_CN\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "æ?±æ?ï¼?ä½ ç??é?®ä»¶è¯·æ±?å?ºç?°é?®é¢?ã??"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "è¯è¨?"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "æ?¥å??æ¼?æ´?"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "æº?代ç ?"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "����"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "è??ç³»æ?¹å¼?"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "é??æ?©å?¨é?¨"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "æ?¾ç¤ºäº?ç»´ç ?"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "è?·å??äº?ç»´ç ?æ?¶å?ºé??ã??"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "ç?°å?¨æ²¡æ??å?¯ç?¨ç??ç½?æ¡¥ã??"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "第 %s 1 %s æ¥"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "�载 %s Tor ��� %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "第 %s 2 %s æ¥"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "è?·å?? %s ç½?æ¡¥ %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "第 %s 3 %s æ¥"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
@@ -137,27 +155,27 @@ msgstr "å¦?ä½? %s å?¨ Tor æµ?è§?å?¨æ·»å? ç½?æ¡¥%s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr " ç?´æ?¥ç»?æ??ç½?æ¡¥(%sJ%s)ï¼? "
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "é«?级é??项"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "å?¦"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "æ? "
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "æ?¯(%sY%s)ï¼?"
@@ -165,69 +183,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "è?·å??ç½?æ¡¥(%sG%s)"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[è¿?æ?¯ä¸?å°?è?ªå?¨ç??æ??ç??é?®ä»¶ï¼?请å?¿å??å¤?ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr "[è¿?æ?¯ä¸?份è?ªå?¨å??é??ç??é?®ä»¶ã??]"
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "以ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 å°?æ?¶ç??é?´é??ã??å?¨é?´é??æ??é?´å??å?ºç??æ??æ??é?®ä»¶å°?被忽ç?¥ã??"
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "å?½ä»¤ï¼?ï¼?ç»?å??使ç?¨å?½ä»¤å?¯å??æ?¶æ??å®?å¤?个é??项ï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "欢��� BridgeDB�"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?®å??å?¯ç?¨ç??ä¼ è¾?ç±»å??ï¼?"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "ä½ å¥½ï¼?%sï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "ä½ å¥½ï¼?æ??å??ï¼?"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "æ?¬é?®ä»¶æ?¯å¯¹ %s ç??è?ªå?¨å??å¤?ï¼?æ?¥æ?? %s %sã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr "å¦?æ??è¿?äº?ç½?æ¡¥ä¸?æ?¯ä½ æ??é??è¦?ç??ï¼?å??å¤?该é?®ä»¶å¹¶å?¨ä¿¡æ?¯ç??主ä½?é?¨å??å??å?«å¦?ä¸?ç??å?½ä»¤ï¼?"
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -238,7 +224,7 @@ msgid ""
msgstr "BridgeDB æ??ä¾?å¤?ç§?%så?¯æ??æ??ä¼ è¾?%sç½?æ¡¥ï¼?ç?¨äº?æ··æ·? Tor ç½?ç»?ç??è¿?æ?¥ï¼?ä»?è??让ç½?ç»?ç??æ?§è??é?¾ä»¥å?¤æ?ä½ å?¨ä½¿ç?¨ Torã??\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -250,7 +236,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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -259,134 +245,169 @@ msgid ""
"\n"
msgstr "æ¤å¤?ï¼?BridgeDB æ??ä¾?å¾?å¤? %s é??å?¯æ??æ??ä¼ è¾? %s ç??æ?®é??ç½?æ¡¥ã??\nè?½ç?¶å?¬èµ·æ?¥ä¸?å¤?é?·ï¼?ä½?æ?¯è¿?äº?æ?®é??ç½?æ¡¥ä¾?ç?¶å?¯ä»¥å?¨å¾?å¤?æ??å?µä¸?帮å?©ç»?è¿?审æ?¥ã??\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "����桥�"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%sç½?æ¡¥%så?³ Tor ä¸ç»§è??ç?¹ï¼?ç?¨äº?帮å?©ç?¨æ?·ç»?è¿?审æ?¥æ??å°?é??ã??"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "é??è¦?使ç?¨å?¶ä»?è?·å??æ?¹å¼?è?·å??ç½?æ¡¥ï¼?"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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ã??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "å?¦ä¸?ç§?è?·å??ç½?æ¡¥ç??æ?¹å¼?æ?¯å?? %s å??é??é?®ä»¶ã??\nå°?é?®ä»¶ä¸»é¢?ç??空ï¼?并å?¨é?®ä»¶æ£æ??å??â??get transport obfs4â??ã??\n请注æ??ï¼?ä½ å¿?须使ç?¨ä¸?å??é?®ä»¶æ??å?¡å??\næ??ä¾?ç??é?®ç®±å??é??é?®ä»¶ï¼?%s æ?? %sã??"
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "ç?¨ç½?æ¡¥ä¹?æ? æ³?è¿?æ?¥ï¼?é??è¦?帮å?©ï¼?"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ?? Tor æ? æ³?æ£å¸¸è¿?è¡?ï¼?请å??é?®ä»¶è?³ %sã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list 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 æ?¾ç¤ºç??ä¿¡æ?¯ç?ç?ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "å¦?æ??æ?¨ç?? Tor æµ?è§?å?¨æ? æ³?è¿?æ?¥ï¼?请æ?¥ç??%så??%sã??"
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "以ä¸?æ?¯ä¸ºä½ æ??ä¾?ç??ç½?æ¡¥ï¼?"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "���桥�"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr "ç½?æ¡¥å??å??æ?ºå?¶"
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "æ? "
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "请é??æ?©ç±»å??ç±»å??ã??"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "æ?¯å?¦é??è¦?IPv6å?°å??ï¼?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "æ?¯å?¦é??è¦? %sï¼?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "æµ?è§?å?¨æ? æ³?æ£ç¡®æ?¾ç¤ºå?¾ç??ã??"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "请è¾?å?¥ä¸?å?¾ä¸ç??å?符ï¼?ä¸?å?ºå??大å°?å??ï¼?..."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "��使��桥"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "å¦?é??å?¨ Tor æµ?è§?å?¨ä¸æ·»å? ç½?æ¡¥ï¼?请å??æ ¹æ?® %s Tor æµ?è§?å?¨ä¸?载页é?¢ %s ç??说æ??ä¸?è½½å??å?¯å?¨ Tor æµ?è§?å?¨ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr "é¦?å??ï¼?æ?¨é??è¦?%sä¸?è½½ Tor Browser%sã??æ??们ç?? Tor Browser ç?¨æ?·æ??å??解ç?äº?å¦?ä½?为 Tor Browser æ·»å? æ?¨ç??ç½?æ¡¥ã??å¦?æ??æ?¨æ£å?¨ä½¿ç?¨ Windowsï¼?Linux æ??è?? OS Xï¼?%sç?¹å?»è¿?é??%s以详ç»?äº?解ã??å¦?æ??æ?¨æ£å?¨ä½¿ç?¨å®?å??ç³»ç»?ï¼?%sç?¹å?»è¿?é??%sã??"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "å½?â??Tor ç½?ç»?设置â?? 对è¯?æ¡?å?ºç?°æ?¶ï¼?ç?¹å?»â??é??ç½®â?? ï¼?ç?¶å??æ ¹æ?®å??导æ??ä½?ï¼?ç?´å?°ç??å?°ä¸?é?¢ç??é?®é¢?ï¼?"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr "æ??å¼?ä½ ç??æµ?è§?å?¨å??好以添å? è¿?äº?ç½?æ¡¥å?°ä½ ç??Tor æµ?è§?å?¨ä¸ï¼?ç?¹å?»â??Torâ??ï¼?ç?¶å??å°?å®?们填å?¥â??æ??ä¾?ä¸?个ç½?æ¡¥â??ä¸?æ ?ä¸ã??"
-#. 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 "ç½?ç»?æ??ä¾?å??ï¼?ISPï¼?æ??å?¶ä»?人æ?¯å?¦å¯¹ Tor ç½?ç»?è¿?æ?¥è¿?è¡?审æ?¥æ??å°?é??ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr "ï¼?请æ±?é??æ··æ·? Tor ç½?æ¡¥ã??ï¼?"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should be good to go! If you experience trouble, try clicking the 'Help'\n"
-"button in the 'Tor Network Settings' wizard for further assistance."
-msgstr "é??æ?©â??æ?¯â??ï¼?ç?¶å??ç?¹å?»â??ä¸?ä¸?æ¥â??ã??å¦?ä¸?æ·»å? æ?°ç??ç½?æ¡¥ï¼?请å°?ç½?æ¡¥å?°å??è¡?é??è¿?å¤?å?¶ç²?è´´ç??æ?¹å¼?è¾?å?¥å?°æ??æ?¬è¾?å?¥æ¡?ã??æ??å??ï¼?ç?¹å?»â??è¿?æ?¥â??å°±å?¯ä»¥è¿?æ?¥è?³ Tor ç½?ç»?ã??å¦?æ??é?®é¢?é??è¦?帮å?©ï¼?请ç?¹å?»â??Tor ç½?ç»?设置â??å??导çª?å?£ä¸ç??â??帮å?©â??æ??é?®ã??"
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "请æ±?æ?®é??ç½?æ¡¥ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "请æ±?IPv6ç½?ç»?ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "æ??ç?§ç±»å??请æ±?ä¸?å??ç??å?¯æ??æ??ä¼ è¾?ç½?æ¡¥ã??"
+msgid "(Request IPv6 bridges.)"
+msgstr "(请æ±?IPv6ç½?æ¡¥ã??)"
-#. 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 "è?·å?? BridgeDB ç?? GnuPG å?¬å?±å¯?å??ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr "ï¼?请æ±?obfs4æ··æ·?ç½?æ¡¥ã??ï¼?"
diff --git a/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po
index d82df60..99b955f 100644
--- a/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_HK/LC_MESSAGES/bridgedb.po
@@ -1,6 +1,6 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# Casper LI <casper.hk@xxxxxxxxxxx>, 2013
@@ -13,116 +13,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2018-04-12 18:54+0000\n"
-"Last-Translator: Chi-Hsun Tsai\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Chinese (Hong Kong) (http://www.transifex.com/otf/torproject/language/zh_HK/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: zh_HK\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "å°?å??ä½?ï¼?ä½ å??è«?æ±?æ??é?¯èª¤ã??"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "��"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "å??å ±é?¯èª¤"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "å??å§?ç¨?å¼?碼"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "����"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "�絡��"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "é?¸æ??å?¨é?¨"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "顯示QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "æ??ç??QRCodeæ??ä¼¼ä¹?ç?¼ç??é?¯èª¤ã??"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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å?«ä½ å??æ©?æ?¥ç·?è·¯ã??以æµ?å??è£?ç½®æ??ç??å?¯å??å¾?ä½ å??æ©?æ?¥ç·?è·¯ã??"
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "ç?®å??ç?¡å?¯ç?¨å??æ©?æ?¥å?¨â?¦"
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "æ¥é©?%s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ä¸?è¼?%s Toræ´?è?¥è·¯ç?±ç??覽å?¨%s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "æ¥é©?%s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "å??å¾?%sæ©?æ?¥å?¨%s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "æ¥é©?%s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "å?¿ã??%så°?æ©?æ?¥å? å?¥å?°Toræ´?è?¥è·¯ç?±ç??覽å?¨%s"
@@ -131,27 +146,27 @@ msgstr "å?¿ã??%så°?æ©?æ?¥å? å?¥å?°Toræ´?è?¥è·¯ç?±ç??覽å?¨%s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%sç??%sæ??æ©?æ?¥ï¼?"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "é?²é??é?¸é ?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "å?¦"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ç?¡"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sæ?¯%sï¼?"
@@ -159,69 +174,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%så??å¾?%sæ©?æ?¥å?¨"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[å?¢å??ä¿?è?ªå??å??è¦?è¨?æ?¯ã??è«?å??好å??è¦?ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "å?¢å??ä¿?ä½ å??æ©?æ?¥å?¨ï¼?"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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å??å°?æ??ã??å?¢æ®µæ??é??å?§å?¨é?¨å?¶ä»?é?µä»¶å°?被忽ç?¥ã??"
-#: bridgedb/strings.py:50
+#: bridgedb/strings.py:40
msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "æ??令ï¼?(å?¯å°?å¤?å??æ??令çµ?å??ä¸?é½?以便å??æ??æ??å®?å¤?å??é?¸é ?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "æ¡è¿?使ç?¨BridgeDBï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?®å??æ?¯æ?´å??å?³è¼¸é¡?å??ï¼?"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "å?¿ï¼?%sï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "æ??å??ï¼?ä½ å¥½ï¼?"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
-msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "å?¢å??%så??é?»é?µä½¿ç?¨rainbowsã??unicornså??sparklesç?¢ç??ï¼?æ??é??ä¿?%så??%sã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -232,7 +215,7 @@ msgid ""
msgstr "BridgeDBå?¯æ??ä¾?幾種%sPluggable Transports%så??æ©?æ?¥ï¼?\nå¹«ä½ ä»¤äººæ··æ·?å??é?£æ?¥å?°Toræ´?è?¥è·¯ç?±ç¶²çµ¡ï¼?é??é??ç?£è¦?ä½ å??\n網絡æµ?é??å??確å®?ä½ æ£ä½¿ç?¨Toræ´?è?¥è·¯ç?±æ??æ?´å? å?°é?£ã??\n\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -244,7 +227,7 @@ msgstr "仲æ??å?²å?·æ??IPv6ä½?å??å??æ©?æ?¥å?¨ï¼?é??ç?¶æ??å?²Pluggable\nTransport
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -253,134 +236,169 @@ msgid ""
"\n"
msgstr "æ¤å¤?ï¼?BridgeDBæ??æ?®é??å??æ©?æ?¥å?¨%sï¼?ç?¡ä»»ä½?\nPluggable Transports %sï¼?æ??è??è?½èµ·å??å??å??ï¼?ä½?\nä»?æ??å?©æ?¼è¦?é?¿å¥½å¤?æ??æ³?ä¸?å??網絡審æ?¥ã??\n\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "�����"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%sæ©?æ?¥å?¨%sä¿?Toræ´?è?¥è·¯ç?±è½?å??ç«?ï¼?å?¯å¹«ä½ è¦?é?¿å¯©æ?¥ã??"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "æ??é??è¦?å?¦ä¸?æ?¹å¼?å??æ©?æ?¥ï¼?"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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ã??è«?注æ??ï¼?ä½ é ?\n使ç?¨ä¸?å??é?»é?µæ??ä¾?è??å??ä½?å??å??å¯?é?»é?µï¼?\n%sã??%sæ??%sã??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr ""
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸é??ä½?ï¼?æ??é??è¦?幫å?©ï¼?"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ??Toræ´?è?¥è·¯ç?±ç?¡æ³?é??ä½?ï¼?å?¯é?»é?µå?°%sã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "ç?¡å?¯è?½å??å?«æ??å¤?æ??é??ä½ æ??æ³?å??è³?è¨?ï¼?å??æ?¬ä½ å??試使ç?¨é??å??\næ©?æ?¥å??Pluggable Transportsæ¸?å?®ã??Toræ´?è?¥è·¯ç?±ç??覽å?¨ç??æ?¬ï¼?\n以å??Toræ´?è?¥è·¯ç?±é¡¯ç¤ºå??ä»»ä½?è¨?æ?¯ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "å?¢å??ä¿?ä½ å??æ©?æ?¥ç·?è·¯ï¼?"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "ç?¡"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "è«?é?¸å??æ©?æ?¥å?¨é¡?å??ï¼?"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "ä½ é??è¦?IPv6ä½?å??å??ï¼?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "ä½ é??è¦?%så??ï¼?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "ä½ å??ç??覽å?¨å??è?½å¤ æ£ç¢ºé¡¯ç¤ºå??å??ã??"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "輸å?¥ä¸?é?¢å??å??ä¸å??å?å??â?¦"
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "é»?樣é??å§?使ç?¨æ©?æ?¥å?¨"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "å°?æ©?æ?¥å?¨è¼¸å?¥å?°Toræ´?è?¥è·¯ç?±ç??覽å?¨ï¼?è«?é¦?å??å??å¾?%s Toræ´?è?¥è·¯ç?±\nç??覽å?¨ä¸?è¼?é ?é?¢%sï¼?並æ??ç?§é ?é?¢ä¸?å??æ??示ä¸?è¼?å??å??å??Toræ´?è?¥\nè·¯ç?±ç??覽å?¨ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ç?¶ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??話å?£å½?å?ºæ??ï¼?æ?³ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§\næ??示ï¼?ç?´å?°å?¶è¦?æ±?ï¼?"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "ä½ å??網絡æ??å??æ??ä¾?è??(ISP)æ??å??æ??é?»æ??æ??é??濾Toræ´?è?¥è·¯ç?±ç¶²çµ¡å??é?£ç·?ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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å¦?æ??é??å?°éº»ç?©ï¼?è«?å??試æ?³ã??Toræ´?è?¥è·¯ç?±ç¶²çµ¡è¨å®?ã??å??ã??説æ??ã??\nå°?æ±?é?²ä¸?æ¥å??å?©ã??"
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "è«?æ±?Vanillaæ©?æ?¥å?¨ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "è«?æ±?IPv6æ©?æ?¥å?¨ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "æ??ç?§TYPEè«?æ±?Pluggable Transportã??"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "å??å¾?BridgeDBå?¬å?±GnuPGé??å??ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
diff --git a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
index 502b260..9cdc685 100644
--- a/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
+++ b/bridgedb/i18n/zh_TW/LC_MESSAGES/bridgedb.po
@@ -1,11 +1,13 @@
-# Translations template for BridgeDB.
-# Copyright (C) 2015 'The Tor Project, Inc.'
-# This file is distributed under the same license as the BridgeDB project.
+# Translations template for bridgedb.
+# Copyright (C) 2020 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
#
# Translators:
# AgustÃn Wu <losangwuyts@xxxxxxxxx>, 2016
# Chi-Hsun Tsai, 2017
# danfong <danfong.hsieh@xxxxxxxxx>, 2014
+# Hsiu-Ming Chang <cges30901@xxxxxxxxx>, 2020
+# Joshua Chang <j.cs.chang@xxxxxxxxx>, 2019
# LNDDYL, 2014
# guihu, 2016
# Cheung Hung, 2015
@@ -14,116 +16,131 @@ msgid ""
msgstr ""
"Project-Id-Version: Tor 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: 2019-02-23 14:36+0000\n"
-"Last-Translator: å?é?¦ ç??\n"
+"POT-Creation-Date: 2020-05-14 14:21-0700\n"
+"PO-Revision-Date: 2020-05-15 08:24+0000\n"
+"Last-Translator: Transifex Bot <>\n"
"Language-Team: Chinese (Taiwan) (http://www.transifex.com/otf/torproject/language/zh_TW/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"Generated-By: Babel 1.3\n"
+"Generated-By: Babel 2.8.0\n"
"Language: zh_TW\n"
"Plural-Forms: nplurals=1; plural=0;\n"
+#. -*- coding: utf-8 ; test-case-name: bridgedb.test.test_https_server -*-
+#. This file is part of BridgeDB, a Tor bridge distribution system.
+#. :authors: please see included AUTHORS file
+#. :copyright: (c) 2007-2017, The Tor Project, Inc.
+#. (c) 2013-2017, Isis Lovecruft
+#. :license: see LICENSE for licensing information
+#. : The path to the HTTPS distributor's web templates. (Should be the
+#. : "templates" directory in the same directory as this file.)
+#. Setting `filesystem_checks` to False is recommended for production servers,
+#. due to potential speed increases. This means that the atimes of the Mako
+#. template files aren't rechecked every time the template is requested
+#. (otherwise, if they are checked, and the atime is newer, the template is
+#. recompiled). `collection_size` sets the number of compiled templates which
+#. are cached before the least recently used ones are removed. See:
+#. http://docs.makotemplates.org/en/latest/usage.html#using-templatelookup
+#. : A list of supported language tuples. Use getSortedLangList() to read this
+#. variable.
+#. We use our metrics singleton to keep track of BridgeDB metrics such as
+#. "number of failed HTTPS bridge requests."
+#. Convert all key/value pairs from bytes to str.
#. TRANSLATORS: Please DO NOT translate the following words and/or phrases in
#. any string (regardless of capitalization and/or punctuation):
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:154
msgid "Sorry! Something went wrong with your request."
msgstr "æ?±æ?ï¼?æ?¨ç??è«?æ±?ç?¼ç??é?¯èª¤ã??"
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:42
+msgid "Language"
+msgstr "��"
+
+#: bridgedb/distributors/https/templates/base.html:94
msgid "Report a Bug"
msgstr "å??å ±é?¯èª¤"
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:97
msgid "Source Code"
msgstr "å??å§?ç¨?å¼?碼"
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:100
msgid "Changelog"
msgstr "è®?æ?´è¨?é??"
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "�絡��"
-
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
msgid "Select All"
msgstr "é?¸æ??å?¨é?¨"
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
msgid "Show QRCode"
msgstr "顯示 QRCode"
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/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
+#: bridgedb/distributors/https/templates/bridges.html:63
msgid "It seems there was an error getting your QRCode."
msgstr "æ??æ?? QRCode æ??ä¼¼ä¹?ç?¼ç??é?¯èª¤"
-#: bridgedb/https/templates/bridges.html:73
+#: bridgedb/distributors/https/templates/bridges.html:68
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
+#: bridgedb/distributors/https/templates/bridges.html:110
+msgid "BridgeDB encountered an error."
+msgstr ""
+
+#: bridgedb/distributors/https/templates/bridges.html:116
msgid "There currently aren't any bridges available..."
msgstr "ç?®å??æ²?æ??ä»»ä½?æ©?æ?¥å?¨æ?¥å?¯ç?¨....."
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:118
+#: bridgedb/distributors/https/templates/bridges.html:122
#, 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
+#: bridgedb/distributors/https/templates/index.html:11
#, python-format
msgid "Step %s1%s"
msgstr "æ¥é©? %s1%s"
-#: bridgedb/https/templates/index.html:13
+#: bridgedb/distributors/https/templates/index.html:13
#, python-format
msgid "Download %s Tor Browser %s"
msgstr "ä¸?è¼? %s æ´?è?¥è·¯ç?±ç??覽å?¨ %s"
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
#, python-format
msgid "Step %s2%s"
msgstr "æ¥é©? %s2%s"
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:28
+#: bridgedb/distributors/https/templates/index.html:30
#, python-format
msgid "Get %s bridges %s"
msgstr "å??å¾? %s æ©?æ?¥å?¨ %s"
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:40
#, python-format
msgid "Step %s3%s"
msgstr "æ¥é©? %s3%s"
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:43
+#: bridgedb/distributors/https/templates/index.html:47
#, python-format
msgid "Now %s add the bridges to Tor Browser %s"
msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??覽å?¨ä¸ %s"
@@ -132,27 +149,27 @@ msgstr "ç?¾å?¨ %s å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??覽å?¨ä¸ %s"
#. beginning of words are present in your final translation. Thanks!
#. (These are used to insert HTML5 underlining tags, to mark accesskeys
#. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:42
#, python-format
msgid "%sJ%sust give me bridges!"
msgstr "%s %s 給æ??æ©?æ?¥å?¨ï¼?"
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:55
msgid "Advanced Options"
msgstr "é?²é??é?¸é ?"
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:93
msgid "No"
msgstr "å?¦"
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:94
msgid "none"
msgstr "ç?¡"
#. TRANSLATORS: Please make sure the '%s' surrounding single 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
+#: bridgedb/distributors/https/templates/options.html:131
#, python-format
msgid "%sY%ses!"
msgstr "%sY%ses!"
@@ -160,69 +177,37 @@ 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
+#: bridgedb/distributors/https/templates/options.html:154
#, python-format
msgid "%sG%set Bridges"
msgstr "%sG%s è¨å®?æ©?æ?¥å?¨"
-#: bridgedb/strings.py:43
-msgid "[This is an automated message; please do not reply.]"
-msgstr "[é??æ?¯ä¸?å??è?ªå??é?µä»¶;è«?ä¸?è¦?å??è¦?ã??]"
+#: bridgedb/strings.py:33
+msgid "[This is an automated email.]"
+msgstr ""
-#: bridgedb/strings.py:45
+#: bridgedb/strings.py:35
msgid "Here are your bridges:"
msgstr "é??æ?¯æ?¨ç??æ©?æ?¥å?¨ï¼?"
-#: bridgedb/strings.py:47
+#: bridgedb/strings.py:37
#, python-format
msgid ""
"You have exceeded the rate 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 å??å°?æ??ã??è¶?é??ç??話ï¼?å?¨é??段æ??é??å?§æ??æ??ç??é?µä»¶å°?被忽ç?¥ã??"
-#: bridgedb/strings.py:50
-msgid ""
-"COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "å?½ä»¤ï¼?(å?¯å°?å¤?å??å?½ä»¤çµ?å??ä¸?起以便å??æ??æ??å®?å¤?å??é?¸é ?)"
-
-#. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
-#: bridgedb/strings.py:53
-msgid "Welcome to BridgeDB!"
-msgstr "æ¡è¿?使ç?¨ BridgeDBï¼?"
-
-#. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
-#: bridgedb/strings.py:55
-msgid "Currently supported transport TYPEs:"
-msgstr "ç?®å??æ?¯æ?´ç??å?³è¼¸é¡?å??ï¼?"
-
-#: bridgedb/strings.py:56
-#, python-format
-msgid "Hey, %s!"
-msgstr "å?¿ï¼?%sï¼?"
-
-#: bridgedb/strings.py:57
-msgid "Hello, friend!"
-msgstr "æ??å??ï¼?æ?¨å¥½ï¼?"
-
-#: 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."
-#: bridgedb/strings.py:62
-#, python-format
+#: bridgedb/strings.py:40
msgid ""
-"This email was generated with rainbows, unicorns, and sparkles\n"
-"for %s on %s at %s."
-msgstr "é??å°?é?»å?é?µä»¶æ?¯ç?º %s æ??ç?¢ç??\nå?¨ %s å?¨ %sã??"
+"If these bridges are not what you need, reply to this email with one of\n"
+"the following commands in the message body:"
+msgstr ""
#. 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".
-#: bridgedb/strings.py:72
+#: bridgedb/strings.py:50
#, python-format
msgid ""
"BridgeDB can provide bridges with several %stypes of Pluggable Transports%s,\n"
@@ -233,7 +218,7 @@ msgid ""
msgstr "BridgeDB å?¯ä»¥ä½¿ç?¨å¹¾ç¨®å?¯æ??æ??å?³è¼¸ %s ç?? %stypes ä¾?æ??ä¾?æ©?æ?¥ï¼?\nå®?å?¯ä»¥å¹«å?©æ?¨æ··æ·?é?£æ?¥å?° Tor Networkï¼?使å?¶ä»»ä½?人è??ç?±ç?£ç??æ?¨ç??網路æµ?\né??ä¾?確å®?æ?¨æ£ä½¿ç?¨ Tor æ??æ?´å? å?°é?£\nã??\n"
#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
-#: bridgedb/strings.py:79
+#: bridgedb/strings.py:57
msgid ""
"Some bridges with IPv6 addresses are also available, though some Pluggable\n"
"Transports aren't IPv6 compatible.\n"
@@ -245,7 +230,7 @@ msgstr "æ??äº?å?·æ?? IPv6 ä½?å??ç??æ©?æ?¥å?¨ä¹?å?¯ä½¿ç?¨ï¼?é??ç?¶æ??äº? Pluggabl
#. 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.
-#: bridgedb/strings.py:88
+#: bridgedb/strings.py:66
#, python-format
msgid ""
"Additionally, BridgeDB has plenty of plain-ol'-vanilla bridges %s without any\n"
@@ -254,134 +239,169 @@ msgid ""
"\n"
msgstr "æ¤å¤?ï¼?BridgeDB æ??æ?®é??ç??æ©?æ?¥å?¨ %sï¼?æ²?æ??ä»»ä½?\nå?¯æ??æ??å?³è¼¸ %sï¼?é??ä¹?許è?½èµ·ä¾?ä¸?é?·ï¼?ä½?å®?\nä»?æ??å?©æ?¼è¦?é?¿å?¨è¨±å¤?æ??æ³?ä¸?ç??網路審æ?¥ã??\n"
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:78 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "�麼�����"
-#: bridgedb/strings.py:102
+#: bridgedb/strings.py:79
#, python-format
msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
msgstr "%s æ©?æ?¥å?¨ %s æ?¯ä¸?種æ´?è?¥è·¯ç?±ç??ä¸ç¹¼ç¯?é»?ï¼?å?¯å¹«å?©æ?¨è¦?é?¿å¯©æ?¥ã??"
-#: bridgedb/strings.py:107
+#: bridgedb/strings.py:84
msgid "I need an alternative way of getting bridges!"
msgstr "æ??é??è¦?使ç?¨å?¶ä»?æ?¹å¼?å??å¾?æ©?æ?¥å?¨ï¼?"
-#: bridgedb/strings.py:108
+#. TRANSLATORS: Please DO NOT translate "get transport obfs4".
+#: bridgedb/strings.py:86
#, 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ã??è«?注æ??ï¼?æ?¨å¿?é ? \n使ç?¨å¾?ä¸?å??é?»å?é?µä»¶æ??ä¾?å» å??ä¹?ä¸?ç??ä½?å??ä¾?ç?¼é??é?»å?é?µä»¶:\n%s, %s æ?? %sã??"
+"Another way to get bridges is to send an email to %s. Leave the email subject\n"
+"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
+"that you must send the email using an address from one of the following email\n"
+"providers: %s or %s."
+msgstr "å??å¾?æ©?æ?¥ç??å?¦ä¸?種æ?¹å¼?æ?¯å?³é??é?»å?é?µä»¶è?³ %sã??é?»å?é?µä»¶ä¸»æ?¨\nç??空ï¼?é?µä»¶æ?¬æ??寫ã??get transport obfs4ã??ã??è«?注æ??ï¼?æ?¨å¿?é ? \n使ç?¨ä¾?è?ªä¸?å??é?»å?é?µä»¶æ??ä¾?è??ä¹?ä¸?ç??ä½?å??å?³é??é?»å?é?µä»¶ï¼?%s æ?? %sã??"
-#: bridgedb/strings.py:115
+#: bridgedb/strings.py:94
msgid "My bridges don't work! I need help!"
msgstr "æ©?æ?¥å?¨ç?¡æ³?æ£å¸¸å?·è¡?ï¼?æ??é??è¦?幫å?©ï¼?"
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:117
-#, python-format
-msgid "If your Tor doesn't work, you should email %s."
-msgstr "å¦?æ??æ?¨ç??æ´?è?¥è·¯ç?±ç?¡æ³?é??ä½?ï¼?æ?¨æ??該ç?¼é??é?»å?é?µä»¶çµ¦ %sã??"
-
-#. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:121
+#. TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and
+#. "Support Portal", respectively.
+#: bridgedb/strings.py:98
+#, python-format
msgid ""
-"Try including as much info about your case as you can, including the list of\n"
-"bridges and Pluggable Transports you tried to use, your Tor Browser version,\n"
-"and any messages which Tor gave out, etc."
-msgstr "è«?å??å?¯è?½ç??給æ??å??æ?´å¤?é??æ?¼æ?¨ç??å??é¡?ä¹?ç?¸é??è³?è¨?ï¼?å??å?«æ?¨å??試使ç?¨é??ç?? \næ©?æ?¥å?¨å??å?¯æ??æ??å?³è¼¸ã??æ?¨ç??æ´?è?¥è·¯ç?±ç??覽å?¨ç??æ?¬\n以å??æ´?è?¥è·¯ç?±çµ¦å?ºç??ä»»ä½?è¨?æ?¯ã??"
+"If your Tor Browser cannot connect, please take a look at the %s and our %s."
+msgstr "å¦?æ?? Tor Browser ç?¡æ³?é?£ç·?ï¼?è«?æ?¥ç?? %s å??æ??å??ç?? %sã??"
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:102
msgid "Here are your bridge lines:"
msgstr "é??裡æ?¯æ?¨ç??æ©?æ?¥ç·?è·¯ï¼?"
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:103
msgid "Get Bridges!"
msgstr "å??å¾?æ©?æ?¥å?¨ï¼?"
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:107
+msgid "Bridge distribution mechanisms"
+msgstr ""
+
+#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat".
+#: bridgedb/strings.py:109
+#, python-format
+msgid ""
+"BridgeDB implements four mechanisms to distribute bridges: \"HTTPS\", \"Moat\",\n"
+"\"Email\", and \"Reserved\". Bridges that are not distributed over BridgeDB use\n"
+"the pseudo-mechanism \"None\". The following list briefly explains how these\n"
+"mechanisms work and our %sBridgeDB metrics%s visualize how popular each of the\n"
+"mechanisms is."
+msgstr ""
+
+#: bridgedb/strings.py:115
+#, python-format
+msgid ""
+"The \"HTTPS\" distribution mechanism hands out bridges over this website. To get\n"
+"bridges, go to %sbridges.torproject.org%s, select your preferred options, and\n"
+"solve the subsequent CAPTCHA."
+msgstr ""
+
+#: bridgedb/strings.py:119
+#, python-format
+msgid ""
+"The \"Moat\" distribution mechanism is part of Tor Browser, allowing users to\n"
+"request bridges from inside their Tor Browser settings. To get bridges, go to\n"
+"your Tor Browser's %sTor settings%s, click on \"request a new bridge\", solve the\n"
+"subsequent CAPTCHA, and Tor Browser will automatically add your new\n"
+"bridges."
+msgstr ""
+
+#: bridgedb/strings.py:125
+#, python-format
+msgid ""
+"Users can request bridges from the \"Email\" distribution mechanism by sending an\n"
+"email to %sbridges@xxxxxxxxxxxxxx%s and writing \"get transport obfs4\" in the\n"
+"email body."
+msgstr ""
+
+#: bridgedb/strings.py:129
+msgid "Reserved"
+msgstr ""
+
+#: bridgedb/strings.py:130
+#, python-format
+msgid ""
+"BridgeDB maintains a small number of bridges that are not distributed\n"
+"automatically. Instead, we reserve these bridges for manual distribution and\n"
+"hand them out to NGOs and other organizations and individuals that need\n"
+"bridges. Bridges that are distributed over the \"Reserved\" mechanism may not\n"
+"see users for a long time. Note that the \"Reserved\" distribution mechanism is\n"
+"called \"Unallocated\" in %sbridge pool assignment%s files."
+msgstr ""
+
+#: bridgedb/strings.py:137
+msgid "None"
+msgstr "ç?¡"
+
+#: bridgedb/strings.py:138
+msgid ""
+"Bridges whose distribution mechanism is \"None\" are not distributed by BridgeDB.\n"
+"It is the bridge operator's responsibility to distribute their bridges to\n"
+"users. Note that on Relay Search, a freshly set up bridge's distribution\n"
+"mechanism says \"None\" for up to approximately one day. Be a bit patient, and\n"
+"it will then change to the bridge's actual distribution mechanism.\n"
+msgstr ""
+
+#: bridgedb/strings.py:148
msgid "Please select options for bridge type:"
msgstr "è«?é?¸æ??æ©?æ?¥å?¨é¡?å??ç??é?¸é ?ï¼?"
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:149
msgid "Do you need IPv6 addresses?"
msgstr "æ?¨é??è¦? IPv6 ä½?å??å??ï¼?"
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:150
#, python-format
msgid "Do you need a %s?"
msgstr "æ?¨é??è¦? %s å??ï¼?"
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:154
msgid "Your browser is not displaying images properly."
msgstr "æ?¨ç??ç??覽å?¨ä¸?è?½æ£ç¢ºé¡¯ç¤ºå??å??ã??"
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:155
msgid "Enter the characters from the image above..."
msgstr "å¾?ä¸?é?¢ç??å??å??ä¸è¼¸å?¥å?å??....."
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:159
msgid "How to start using your bridges"
msgstr "å¦?ä½?é??å§?使ç?¨æ?¨ç??æ©?æ?¥å?¨"
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:161
#, python-format
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 "è?¥è¦?å°?æ©?æ?¥å?¨å? å?¥å?°æ´?è?¥è·¯ç?±ç??覽å?¨ä¸ï¼?é¦?å??è«?å?° %s æ´?è?¥è·¯ç?±ç??覽å?¨ä¸?è¼?é ?é?¢ %s 並æ??ç?§é ?é?¢ä¸?ç??說æ??ä¾?ä¸?è¼?å??å??å??æ´?è?¥è·¯ç?±ç??覽å?¨ã??"
+" First, you need to %sdownload Tor Browser%s. Our Tor Browser User\n"
+" Manual explains how you can add your bridges to Tor Browser. If you are\n"
+" using Windows, Linux, or OS X, %sclick here%s to learn more. If you\n"
+" are using Android, %sclick here%s."
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:166
msgid ""
-"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
-"the wizard until it asks:"
-msgstr "ç?¶ã??æ´?è?¥è·¯ç?±ç¶²è·¯è¨å®?ã??å°?話å½?å?ºæ??ï¼?æ??ä¸?ä¸?ã??è¨å®?ã??ï¼?ç?¶å¾?æ??ç?§è¨å®?ç²¾é??ç??å°?å¼?é?²è¡?ï¼?"
+"Add these bridges to your Tor Browser by opening your browser\n"
+"preferences, clicking on \"Tor\", and then adding them to the \"Provide a\n"
+"bridge\" field."
+msgstr ""
-#. 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 "æ?¨ç??網é??網路æ??å??ä¾?æ??å??(ISP)é?»æ??æ??é??濾æ´?è?¥è·¯ç?±ç¶²è·¯ç??é?£ç·?å??ï¼?"
+#: bridgedb/strings.py:173
+msgid "(Request unobfuscated Tor bridges.)"
+msgstr ""
-#. TRANSLATORS: Please DO NOT translate "Tor".
-#: 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"
-"you should 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æ??é??å°?æ±?é?²ä¸?æ¥ç??å??å?© ã??"
-
-#: 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.
-#: bridgedb/strings.py:171
-msgid "Request vanilla bridges."
-msgstr "è«?æ±?æ¨?æº?æ©?æ?¥å?¨ã??"
-
-#: bridgedb/strings.py:172
-msgid "Request IPv6 bridges."
-msgstr "è«?æ±? IPv6 æ©?æ?¥å?¨ã??"
-
-#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
#: bridgedb/strings.py:174
-msgid "Request a Pluggable Transport by TYPE."
-msgstr "æ??ç?§ TYPE è«?æ±?å?¯æ??æ??å?³è¼¸ã??"
+msgid "(Request IPv6 bridges.)"
+msgstr ""
-#. 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 "å??å¾? BridgeDB ä¸?ç?? GnuPG å?¬é??é??é?°å?¯æ?¬ã??"
+#: bridgedb/strings.py:175
+msgid "(Request obfs4 obfuscated bridges.)"
+msgstr ""
_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits