[tor-commits] [translation/bridgedb_completed] https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed

[translation at torproject.org]

commit b233e1edc28fed91213f5cd91f2a9778c2b90d19
Author: Translation commit bot <translation at torproject.org>
Date:   Sun Oct 6 11:15:27 2019 +0000

    https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed
---
 ja/LC_MESSAGES/bridgedb.po | 218 +++++++++++++++++++------------------
 ru/LC_MESSAGES/bridgedb.po | 262 +++++++++++++++++++++++----------------------
 2 files changed, 246 insertions(+), 234 deletions(-)

diff --git a/ja/LC_MESSAGES/bridgedb.po b/ja/LC_MESSAGES/bridgedb.po
index 6979bb40d..caf037ab1 100644
--- a/ja/LC_MESSAGES/bridgedb.po
+++ b/ja/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) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # 323484, 2018
@@ -9,23 +9,43 @@
 # azumukupoe, 2017
 # タカハシ <indexial at outlook.jp>, 2013
 # タカハシ <indexial at outlook.jp>, 2014
+# h345u37g3 h345u37g3 <h345u37g3 at cock.li>, 2019
 # Masaki Saito <rezoolab at gmail.com>, 2013
 # 藤前　甲 <m1440809437 at hiru-dea.com>, 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: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-06 10:46+0000\n"
+"Last-Translator: h345u37g3 h345u37g3 <h345u37g3 at cock.li>\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.7.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
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. 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"
@@ -37,94 +57,90 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
-msgstr "申し訳ありません！リクエストに問題がありました。"
+msgstr ""
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
 msgstr "バグを報告する"
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
 msgstr "ソースコード"
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 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 "すべて選択"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "QR コードを表示"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "あなたのブリッジラインの QR コード"
+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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr "おっとスパゲッティ！"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "QR コードを作成する際にエラーが発生しました。"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:73
+#: 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 "この QR コードはあなたのブリッジラインを含みます。携帯端末などのデバイスで読み込むことで、ブリッジラインをコピーできます。"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr "今の時点では利用できるブリッジがありません..."
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "おそらく 、 %s 戻って %s 異なるブリッジタイプを選択してみるべきでしょう。"
+msgstr ""
 
-#: 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:27
 #, python-format
 msgid "Get %s bridges %s"
 msgstr "%s ブリッジ %s を手に入れる"
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
 msgstr "ステップ %s3%s"
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
 msgstr "%s Tor Browser にブリッジを追加します %s"
@@ -133,27 +149,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:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sあ%sの、ください、 bridges!"
+msgstr ""
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
-msgstr "高度な設定"
+msgstr ""
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
 msgstr "いいえ"
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
-msgstr "なし"
+msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single 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:124
 #, python-format
 msgid "%sY%ses!"
 msgstr "%sは%sい！"
@@ -161,10 +177,10 @@ 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:147
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sG%set Bridges"
+msgstr ""
 
 #: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
@@ -172,19 +188,19 @@ msgstr "[このメールは自動送信されたメッセージです。返信
 
 #: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "あなたのブリッジはこちら:"
+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 "レート制限を超過しました。メール間の最小時間は %s 時間です。この期間中にさらに送信したメールは全て無視されます。"
+msgstr ""
 
 #: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "コマンド: (コマンドを組み合わせて、同時に複数のオプションを指定する)"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: bridgedb/strings.py:53
@@ -194,18 +210,18 @@ msgstr "BridgeDB へようこそ！"
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "現在サポートされているトランスポートタイプ:"
+msgstr ""
 
 #: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr "どうも %s さん！"
+msgstr ""
 
 #: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "どうも、こんにちは！"
+msgstr ""
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
 msgstr "公開鍵"
 
@@ -217,7 +233,7 @@ msgstr "公開鍵"
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "このメールは %s に %s %s に rainbow 及び unicorn 、 sparkle で生成されました。"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -231,7 +247,7 @@ 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 ""
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -239,7 +255,7 @@ msgid ""
 "Some bridges with IPv6 addresses are also available, though some Pluggable\n"
 "Transports aren't IPv6 compatible.\n"
 "\n"
-msgstr "IPv6 のアドレスのブリッジも利用できるものがありますが、 Pluggable Transports には IPv6 に互換性がないものもあります。\n\n"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -253,9 +269,9 @@ msgid ""
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "加えて、  BridgeDB は、 %s Pluggable Transport %s のない多くの何の変哲もない\n通常のブリッジを持ち、それはクールには思えないかもしれません。しかし、多くの場合、インターネット検閲を回避するのになお有効です。\n"
+msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
 msgstr "ブリッジとは？"
 
@@ -266,123 +282,113 @@ msgstr "%s ブリッジ %s は、 インターネット検閲を回避する助
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "ブリッジを得る他の方法が必要です!"
+msgstr ""
 
 #: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "ブリッジを入手する別のやり方は %s までメールを送ることです。\n以下のメールプロバイダのうちの1つのアドレスを使用してメールを送信しなければならないことにご注意ください:\n %s 、 %s または %s"
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "私のブリッジが動きません! 助けてください!"
+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 までメールを下さい。"
+msgid "If your Tor cannot connect, please take a look at the %s and our %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
-msgid ""
-"Try including as much info about your case as you can, including the list 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 が出力したメッセージ等などを含み、出来る限りあなたのケースに関する多くの情報を含めてみてください。"
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "あなたのブリッジラインはこちらです:"
+msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
 msgstr "ブリッジを入手！"
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
-msgstr "ブリッジタイプのオプションを選択してください:"
+msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
-msgstr "IPv6 アドレスが必要ですか？"
+msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
-msgstr "%s が必要ですか？"
+msgstr ""
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
 msgstr "ご利用のブラウザは適切に画像を表示していません。"
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
-msgstr "上記の画像から文字を入力してください..."
+msgstr ""
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
-msgstr "ブリッジ使用の始め方"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, 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 のダウンロード方法と始め方の説明をご覧ください。"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "「Tor ネットワーク設定」ダイアログがポップアップした際、設定をクリックして\n聞かれるまでウィザードに従ってください。"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
 msgstr "ご利用のインターネットサービスプロバイダー (ISP) は Tor ネットワークへの接続をブロックないし\n別のやり方で検閲していますか？"
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then 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 ネットワーク設定」ウィザード内「ヘルプ」ボタンをクリックしてください。"
+msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
-msgstr "この画像を表示"
+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
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
-msgstr "vanilla ブリッジをリクエスト"
+msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
 msgstr "IPv6 ブリッジをリクエスト"
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "タイプごとに Pluggable Transport をリクエスト"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "BridgeDB の GnuPG 公開鍵のコピーを手に入れましょう。"
+msgstr ""
diff --git a/ru/LC_MESSAGES/bridgedb.po b/ru/LC_MESSAGES/bridgedb.po
index f1b1475b6..a5f47426a 100644
--- a/ru/LC_MESSAGES/bridgedb.po
+++ b/ru/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) 2019 'The Tor Project, Inc.'
+# This file is distributed under the same license as the bridgedb project.
 # 
 # Translators:
 # Andrey, 2017
@@ -19,27 +19,47 @@
 # Oleg, 2014
 # Roberto Brigante, 2017
 # Sergey Briskin, 2014
-# Timofey Lisunov <solokot at gmail.com>, 2018
+# solokot <solokot at gmail.com>, 2019
+# solokot <solokot at gmail.com>, 2018
 # Valid Olov, 2014
 # vb[fbk <kisn23 at mail.ru>, 2015
 # Виктор Ерухин <rewanh59 at gmail.com>, 2016
 # Vitaliy Grishenko, 2014
-# Uho Lot <yavinav at gmail.com>, 2016
+# Andrey Kostrikov <yavinav at gmail.com>, 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 at live.ru>\n"
+"POT-Creation-Date: 2019-10-03 15:04-0700\n"
+"PO-Revision-Date: 2019-10-06 10:47+0000\n"
+"Last-Translator: solokot <solokot at gmail.com>\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.7.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
+#. : Localisations which BridgeDB supports which should be rendered right-to-
+#. left.
+#. 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"
@@ -51,177 +71,173 @@ msgstr ""
 #. "fteproxy"
 #. "Tor"
 #. "Tor Browser"
-#: bridgedb/https/server.py:167
+#: bridgedb/distributors/https/server.py:135
 msgid "Sorry! Something went wrong with your request."
-msgstr "Извините! Что-то пошло не так с вашим запросом."
+msgstr ""
 
-#: bridgedb/https/templates/base.html:79
+#: bridgedb/distributors/https/templates/base.html:79
 msgid "Report a Bug"
-msgstr "Сообщить об ошибке"
+msgstr ""
 
-#: bridgedb/https/templates/base.html:82
+#: bridgedb/distributors/https/templates/base.html:82
 msgid "Source Code"
-msgstr "Исходный код"
+msgstr ""
 
-#: bridgedb/https/templates/base.html:85
+#: bridgedb/distributors/https/templates/base.html:85
 msgid "Changelog"
-msgstr "Журнал изменений"
-
-#: bridgedb/https/templates/base.html:88
-msgid "Contact"
-msgstr "Контакты"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:35
+#: bridgedb/distributors/https/templates/bridges.html:35
 msgid "Select All"
-msgstr "Выбрать все"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:40
+#: bridgedb/distributors/https/templates/bridges.html:40
 msgid "Show QRCode"
-msgstr "Показать QR-код"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:52
+#: bridgedb/distributors/https/templates/bridges.html:52
 msgid "QRCode for your bridge lines"
-msgstr "QR-код для адресов ретрансляторов"
+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
+#: bridgedb/distributors/https/templates/bridges.html:67
+#: bridgedb/distributors/https/templates/bridges.html:125
 msgid "Uh oh, spaghettios!"
-msgstr "Эх, что-то пошло не так!"
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:68
+#: bridgedb/distributors/https/templates/bridges.html:68
 msgid "It seems there was an error getting your QRCode."
-msgstr "Похоже, произошла ошибка при получении QR-кода."
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:73
+#: 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 "Этот QR-код содержит адреса ретрансляторов. Отсканируйте его устройством, считывающим QR-код, чтобы скопировать адреса рестрансляторов на мобильные и другие устройства."
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:131
+#: bridgedb/distributors/https/templates/bridges.html:131
 msgid "There currently aren't any bridges available..."
-msgstr "На данный момент нет доступных мостов..."
+msgstr ""
 
-#: bridgedb/https/templates/bridges.html:132
+#: bridgedb/distributors/https/templates/bridges.html:132
 #, python-format
 msgid ""
 " Perhaps you should try %s going back %s and choosing a different bridge "
 "type!"
-msgstr "Возможно, вам стоит попробовать %s вернуться%s и выбрать другой тип моста!"
+msgstr ""
 
-#: bridgedb/https/templates/index.html:11
+#: bridgedb/distributors/https/templates/index.html:11
 #, python-format
 msgid "Step %s1%s"
-msgstr "Шаг %s№1%s"
+msgstr ""
 
-#: 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"
+msgstr ""
 
-#: bridgedb/https/templates/index.html:25
+#: bridgedb/distributors/https/templates/index.html:25
 #, python-format
 msgid "Step %s2%s"
-msgstr "Шаг %s№2%s"
+msgstr ""
 
-#: bridgedb/https/templates/index.html:27
+#: bridgedb/distributors/https/templates/index.html:27
 #, python-format
 msgid "Get %s bridges %s"
-msgstr "Установите %s мосты %s"
+msgstr ""
 
-#: bridgedb/https/templates/index.html:36
+#: bridgedb/distributors/https/templates/index.html:36
 #, python-format
 msgid "Step %s3%s"
-msgstr "Шаг %s№3%s"
+msgstr ""
 
-#: bridgedb/https/templates/index.html:38
+#: bridgedb/distributors/https/templates/index.html:38
 #, python-format
 msgid "Now %s add the bridges to Tor Browser %s"
-msgstr "Затем %s добавьте адреса мостов в Tor Browser %s"
+msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. (These are used to insert HTML5 underlining tags, to mark accesskeys
 #. for disabled users.)
-#: bridgedb/https/templates/options.html:38
+#: bridgedb/distributors/https/templates/options.html:38
 #, python-format
 msgid "%sJ%sust give me bridges!"
-msgstr "%sП%sросто добавьте ваш адрес моста!"
+msgstr ""
 
-#: bridgedb/https/templates/options.html:51
+#: bridgedb/distributors/https/templates/options.html:51
 msgid "Advanced Options"
-msgstr "Дополнительные настройки"
+msgstr ""
 
-#: bridgedb/https/templates/options.html:86
+#: bridgedb/distributors/https/templates/options.html:86
 msgid "No"
-msgstr "Нет"
+msgstr ""
 
-#: bridgedb/https/templates/options.html:87
+#: bridgedb/distributors/https/templates/options.html:87
 msgid "none"
-msgstr "отсутствует"
+msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single 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:124
 #, python-format
 msgid "%sY%ses!"
-msgstr "%sД%sа! "
+msgstr ""
 
 #. TRANSLATORS: Please make sure the '%s' surrounding single letters at the
 #. beginning of words are present in your final translation. Thanks!
 #. TRANSLATORS: Please do NOT translate the word "bridge"!
-#: bridgedb/https/templates/options.html:147
+#: bridgedb/distributors/https/templates/options.html:147
 #, python-format
 msgid "%sG%set Bridges"
-msgstr "%sПолучить адреса мостов%s"
+msgstr ""
 
 #: bridgedb/strings.py:43
 msgid "[This is an automated message; please do not reply.]"
-msgstr "[Это автоматическое сообщение, пожалуйста, не отвечайте на него.]"
+msgstr ""
 
 #: bridgedb/strings.py:45
 msgid "Here are your bridges:"
-msgstr "Ваши адреса мостов:"
+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 "Вы превысили допустимый лимит. Пожалуйста, повторите запрос позже!\nПовторить запрос можно через %s часов. Сообщения, отправленные до этого времени, будут проигнорированы."
+msgstr ""
 
 #: bridgedb/strings.py:50
 msgid ""
 "COMMANDs: (combine COMMANDs to specify multiple options simultaneously)"
-msgstr "КОМАНДЫ: (совмещайте команды, чтобы использовать несколько функций одновременно)"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word "BridgeDB".
 #: bridgedb/strings.py:53
 msgid "Welcome to BridgeDB!"
-msgstr "Добро пожаловать в BridgeDB!"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the words "transport" or "TYPE".
 #: bridgedb/strings.py:55
 msgid "Currently supported transport TYPEs:"
-msgstr "Текущий поддерживаемой тип передачи  - TYPEs:"
+msgstr ""
 
 #: bridgedb/strings.py:56
 #, python-format
 msgid "Hey, %s!"
-msgstr "Эй, %s!"
+msgstr ""
 
 #: bridgedb/strings.py:57
 msgid "Hello, friend!"
-msgstr "Здравствуй, друг!"
+msgstr ""
 
-#: bridgedb/strings.py:58 bridgedb/https/templates/base.html:90
+#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58
 msgid "Public Keys"
-msgstr "Открытые ключи"
+msgstr ""
 
 #. TRANSLATORS: This string will end up saying something like:
 #. "This email was generated with rainbows, unicorns, and sparkles
@@ -231,7 +247,7 @@ msgstr "Открытые ключи"
 msgid ""
 "This email was generated with rainbows, unicorns, and sparkles\n"
 "for %s on %s at %s."
-msgstr "Это письмо было автоматически отправлено при помощи радуги, единорогов и северного сияния\nдля %s в %s, в %s."
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
@@ -245,7 +261,7 @@ 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 ""
 
 #. TRANSLATORS: Please DO NOT translate "Pluggable Transports".
 #: bridgedb/strings.py:79
@@ -253,7 +269,7 @@ 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 ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: The phrase "plain-ol'-vanilla" means "plain, boring,
@@ -267,136 +283,126 @@ msgid ""
 "Pluggable Transports %s which maybe doesn't sound as cool, but they can still\n"
 "help to circumvent internet censorship in many cases.\n"
 "\n"
-msgstr "Более того, BridgeDB содержит множество стандартных мостов %s, не поддерживающий передачу данных %s, что может повлиять на отображение страницы сайта, так-же они во многих случаях, помогают обойти интернет-цензуру.\n"
+msgstr ""
 
-#: bridgedb/strings.py:101
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
 msgid "What are bridges?"
-msgstr "Что такое соединение типа мост?"
+msgstr ""
 
 #: bridgedb/strings.py:102
 #, python-format
 msgid "%s Bridges %s are Tor relays that help you circumvent censorship."
-msgstr "%s Мост %s — это сетевое соединение в сети Tor, которое позволяет вам просматривать заблокированные сайты."
+msgstr ""
 
 #: bridgedb/strings.py:107
 msgid "I need an alternative way of getting bridges!"
-msgstr "Другой способ получение списка соединений типа мост!"
+msgstr ""
 
 #: bridgedb/strings.py:108
 #, python-format
 msgid ""
 "Another way to get bridges is to send an email to %s. Please note that you must\n"
 "send the email using an address from one of the following email providers:\n"
-"%s, %s or %s."
-msgstr "Другим способом для получения списка мостов является отправка электронного сообщения на адрес %s. Обратите внимание,  вы должны отправить электронный запрос только с использованием одного из доступных сервисов: %s, %s или %s."
+"%s or %s."
+msgstr ""
 
 #: bridgedb/strings.py:115
 msgid "My bridges don't work! I need help!"
-msgstr "Нет соединения с мостом! Помогите!"
+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."
+msgid "If your Tor cannot connect, please take a look at the %s and our %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
-msgid ""
-"Try including as much info about your case as you can, including the list 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."
-
-#: bridgedb/strings.py:128
 msgid "Here are your bridge lines:"
-msgstr "Строка ввода адресов мостов:"
+msgstr ""
 
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:122
 msgid "Get Bridges!"
-msgstr "Получить адрес моста!"
+msgstr ""
 
-#: bridgedb/strings.py:133
+#: bridgedb/strings.py:126
 msgid "Please select options for bridge type:"
-msgstr "Пожалуйста, выберите параметры типа моста:"
+msgstr ""
 
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:127
 msgid "Do you need IPv6 addresses?"
-msgstr "Используете адреса IPv6?"
+msgstr ""
 
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:128
 #, python-format
 msgid "Do you need a %s?"
-msgstr "Будете использовать %s?"
+msgstr ""
 
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:132
 msgid "Your browser is not displaying images properly."
-msgstr "Браузер некорректно отображает изображения."
+msgstr ""
 
-#: bridgedb/strings.py:140
+#: bridgedb/strings.py:133
 msgid "Enter the characters from the image above..."
-msgstr "Введите символы с изображения..."
+msgstr ""
 
-#: bridgedb/strings.py:144
+#: bridgedb/strings.py:137
 msgid "How to start using your bridges"
-msgstr "Как использовать мосты?"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:139
 #, 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."
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:151
+#: bridgedb/strings.py:144
 msgid ""
 "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and follow\n"
 "the wizard until it asks:"
-msgstr "Перейти во вкладку 'Сетевые настройки Tor', далее нажать 'Настроить' и следовать инструкциям установщика, пока вы не увидите вопрос:"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:155
+#: bridgedb/strings.py:148
 msgid ""
 "Does your Internet Service Provider (ISP) block or otherwise censor connections\n"
 "to the Tor network?"
-msgstr "Блокирует ли ваш интернет провайдер подключения к сети Tor?"
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:159
+#: bridgedb/strings.py:152
 msgid ""
 "Select 'Yes' and then 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' для получения помощи."
+msgstr ""
 
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:160
 msgid "Displays this message."
-msgstr "Выводит это сообщение."
+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
+#: bridgedb/strings.py:164
 msgid "Request vanilla bridges."
-msgstr "Запросить обычные мосты."
+msgstr ""
 
-#: bridgedb/strings.py:172
+#: bridgedb/strings.py:165
 msgid "Request IPv6 bridges."
-msgstr "Запросить мосты с поддержкой IPv6."
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:174
+#: bridgedb/strings.py:167
 msgid "Request a Pluggable Transport by TYPE."
-msgstr "Запросить подключаемый транспорт TYPE."
+msgstr ""
 
 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:177
+#: bridgedb/strings.py:170
 msgid "Get a copy of BridgeDB's public GnuPG key."
-msgstr "Получить копию открытого GnuPG-ключа BridgeDB."
+msgstr ""