[tor-commits] [bridgedb/develop] Explain what should go into the email body.
phw at torproject.org
phw at torproject.org
Tue Feb 4 19:38:57 UTC 2020
commit 6a4891cf07aa5181ffc351a1a86765f981e1ce5a
Author: Philipp Winter <phw at nymity.ch>
Date: Tue Jan 28 10:36:01 2020 -0800
Explain what should go into the email body.
...if we don't explain it here, we're forcing our users to go through at
least one iteration of BridgeDB's help emails. Also, we might as well
tell people to request an obfs4 bridge because vanilla bridges are less
useful to the average user.
---
bridgedb/i18n/templates/bridgedb.pot | 60 +++++++++++++++++++-----------------
bridgedb/strings.py | 8 +++--
2 files changed, 37 insertions(+), 31 deletions(-)
diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot
index 7e16c26..483abbc 100644
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -1,15 +1,15 @@
# Translations template for bridgedb.
-# Copyright (C) 2019 'The Tor Project, Inc.'
+# Copyright (C) 2020 'The Tor Project, Inc.'
# This file is distributed under the same license as the bridgedb project.
-# FIRST AUTHOR <EMAIL at ADDRESS>, 2019.
+# FIRST AUTHOR <EMAIL at ADDRESS>, 2020.
#
msgid ""
msgstr ""
-"Project-Id-Version: bridgedb 0.9.0+3.gfd0c28d.dirty\n"
+"Project-Id-Version: bridgedb 0.9.0+19.ga5fa455.dirty\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: 2019-10-19 14:51-0700\n"
+"POT-Creation-Date: 2020-02-04 10:59-0800\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at li.org>\n"
@@ -283,62 +283,66 @@ msgstr ""
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:109
#, 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 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: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:119
+#: 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:123
+#: bridgedb/strings.py:125
msgid "Here are your bridge lines:"
msgstr ""
-#: bridgedb/strings.py:124
+#: bridgedb/strings.py:126
msgid "Get Bridges!"
msgstr ""
-#: bridgedb/strings.py:128
+#: bridgedb/strings.py:130
msgid "Please select options for bridge type:"
msgstr ""
-#: bridgedb/strings.py:129
+#: bridgedb/strings.py:131
msgid "Do you need IPv6 addresses?"
msgstr ""
-#: bridgedb/strings.py:130
+#: bridgedb/strings.py:132
#, python-format
msgid "Do you need a %s?"
msgstr ""
-#: bridgedb/strings.py:134
+#: bridgedb/strings.py:136
msgid "Your browser is not displaying images properly."
msgstr ""
-#: bridgedb/strings.py:135
+#: bridgedb/strings.py:137
msgid "Enter the characters from the image above..."
msgstr ""
-#: bridgedb/strings.py:139
+#: bridgedb/strings.py:141
msgid "How to start using your bridges"
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor Browser".
-#: bridgedb/strings.py:141
+#: bridgedb/strings.py:143
#, python-format
msgid ""
"To enter bridges into Tor Browser, first go to the %s Tor Browser download\n"
@@ -347,7 +351,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:146
+#: bridgedb/strings.py:148
msgid ""
"When the 'Tor Network Settings' dialogue pops up, click 'Configure' and "
"follow\n"
@@ -355,7 +359,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:150
+#: bridgedb/strings.py:152
msgid ""
"Does your Internet Service Provider (ISP) block or otherwise censor "
"connections\n"
@@ -363,7 +367,7 @@ msgid ""
msgstr ""
#. TRANSLATORS: Please DO NOT translate "Tor".
-#: bridgedb/strings.py:154
+#: 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"
@@ -372,29 +376,29 @@ msgid ""
"button in the 'Tor Network Settings' wizard for further assistance."
msgstr ""
-#: bridgedb/strings.py:162
+#: 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:166
+#: bridgedb/strings.py:168
msgid "Request vanilla bridges."
msgstr ""
-#: bridgedb/strings.py:167
+#: bridgedb/strings.py:169
msgid "Request IPv6 bridges."
msgstr ""
#. TRANSLATORS: Please DO NOT translate the word the word "TYPE".
-#: bridgedb/strings.py:169
+#: 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:172
+#: bridgedb/strings.py:174
msgid "Get a copy of BridgeDB's public GnuPG key."
msgstr ""
diff --git a/bridgedb/strings.py b/bridgedb/strings.py
index f6e2d69..e97c68a 100644
--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -105,10 +105,12 @@ FAQ = {
OTHER_DISTRIBUTORS = {
0: _("I need an alternative way of getting bridges!"),
+# TRANSLATORS: Please DO NOT translate "get transport obfs4".
1: _("""\
-Another way to get bridges is to send an email to %s. Please note that you must
-send the email using an address from one of the following email providers:
-%s or %s."""),
+Another way to get bridges is to send an email to %s. Leave the email subject
+empty and write "get transport obfs4" in the email's message body. Please note
+that you must send the email using an address from one of the following email
+providers: %s or %s."""),
}
HELP = {
More information about the tor-commits
mailing list