commit 49d63b5be1dfdb2a97433be6ce24954cee71712f Author: Translation commit bot translation@torproject.org Date: Thu Mar 19 07:16:04 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb_completed --- templates/bridgedb.pot | 119 ++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 93 insertions(+), 26 deletions(-)
diff --git a/templates/bridgedb.pot b/templates/bridgedb.pot index a4d6849960..ba3d8ab146 100644 --- a/templates/bridgedb.pot +++ b/templates/bridgedb.pot @@ -9,8 +9,8 @@ msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&ke..." -"POT-Creation-Date: 2020-02-04 10:59-0800\n" -"PO-Revision-Date: 2020-02-05 01:11+0000\n" +"POT-Creation-Date: 2020-03-18 09:23-0700\n" +"PO-Revision-Date: 2020-03-19 07:14+0000\n" "Last-Translator: carolyn carolyn@anhalt.org\n" "Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)%5Cn" "MIME-Version: 1.0\n" @@ -39,18 +39,16 @@ msgstr "" #. 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/distributors/https/server.py:138 +#: bridgedb/distributors/https/server.py:154 msgid "Sorry! Something went wrong with your request." msgstr ""
@@ -58,15 +56,15 @@ msgstr "" msgid "Language" msgstr ""
-#: bridgedb/distributors/https/templates/base.html:92 +#: bridgedb/distributors/https/templates/base.html:94 msgid "Report a Bug" msgstr ""
-#: bridgedb/distributors/https/templates/base.html:95 +#: bridgedb/distributors/https/templates/base.html:97 msgid "Source Code" msgstr ""
-#: bridgedb/distributors/https/templates/base.html:98 +#: bridgedb/distributors/https/templates/base.html:100 msgid "Changelog" msgstr ""
@@ -221,7 +219,7 @@ msgstr "" msgid "Hello, friend!" msgstr ""
-#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 +#: bridgedb/distributors/https/templates/base.html:102 bridgedb/strings.py:58 msgid "Public Keys" msgstr ""
@@ -271,7 +269,7 @@ msgid "" "\n" msgstr ""
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383 +#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356 msgid "What are bridges?" msgstr ""
@@ -316,32 +314,101 @@ msgid "Get Bridges!" msgstr ""
#: bridgedb/strings.py:130 +msgid "Bridge distribution mechanisms" +msgstr "" + +#. TRANSLATORS: Please DO NOT translate "BridgeDB", "HTTPS", and "Moat". +#: bridgedb/strings.py:132 +#, 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:138 +#, 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:142 +#, 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:148 +#, python-format +msgid "" +"Users can request bridges from the "Email" distribution mechanism by sending an\n" +"email to %sbridges@torproject.org%s and writing "get transport obfs4" in the\n" +"email body." +msgstr "" + +#: bridgedb/strings.py:152 +msgid "Reserved" +msgstr "" + +#: bridgedb/strings.py:153 +#, 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:160 +msgid "None" +msgstr "" + +#: bridgedb/strings.py:161 +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:171 msgid "Please select options for bridge type:" msgstr ""
-#: bridgedb/strings.py:131 +#: bridgedb/strings.py:172 msgid "Do you need IPv6 addresses?" msgstr ""
-#: bridgedb/strings.py:132 +#: bridgedb/strings.py:173 #, python-format msgid "Do you need a %s?" msgstr ""
-#: bridgedb/strings.py:136 +#: bridgedb/strings.py:177 msgid "Your browser is not displaying images properly." msgstr ""
-#: bridgedb/strings.py:137 +#: bridgedb/strings.py:178 msgid "Enter the characters from the image above..." msgstr ""
-#: bridgedb/strings.py:141 +#: bridgedb/strings.py:182 msgid "How to start using your bridges" msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:143 +#: bridgedb/strings.py:184 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -350,21 +417,21 @@ msgid "" msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 +#: bridgedb/strings.py:189 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 +#: bridgedb/strings.py:193 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 +#: bridgedb/strings.py:197 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" @@ -372,28 +439,28 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr ""
-#: bridgedb/strings.py:164 +#: bridgedb/strings.py:205 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 +#: bridgedb/strings.py:209 msgid "Request vanilla bridges." msgstr ""
-#: bridgedb/strings.py:169 +#: bridgedb/strings.py:210 msgid "Request IPv6 bridges." msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:171 +#: bridgedb/strings.py:212 msgid "Request a Pluggable Transport by TYPE." msgstr ""
#. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:174 +#: bridgedb/strings.py:215 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr ""