Merge branch 'defect/30941' into develop

208b49cd · Philipp Winter · bca64964 · 8b4a087c · 208b49cd · 208b49cd
Unverified Commit 208b49cd authored Apr 7, 2020 by Philipp Winter
--- a/bridgedb/i18n/templates/bridgedb.pot
+++ b/bridgedb/i18n/templates/bridgedb.pot
@@ -5,11 +5,11 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: bridgedb 0.10.0+8.g97621c0\n"
+"Project-Id-Version: bridgedb 0.10.0+7.gbca6496.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: 2020-04-06 13:53-0700\n"
+"POT-Creation-Date: 2020-04-07 10:14-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -422,14 +422,13 @@ msgstr ""
 msgid "(Request IPv6 bridges.)"
 msgstr ""

-#. TRANSLATORS: Please DO NOT translate the word "TYPE".
-#: bridgedb/strings.py:185
-msgid "(Request obfuscated bridges. Replace TYPE with 'obfs4'.)"
+#: bridgedb/strings.py:184
+msgid "(Request obfs4 obfuscated bridges.)"
 msgstr ""

 #. TRANSLATORS: Please DO NOT translate "BridgeDB".
 #. TRANSLATORS: Please DO NOT translate "GnuPG".
-#: bridgedb/strings.py:189
+#: bridgedb/strings.py:187
 msgid "(Get a copy of BridgeDB's public GnuPG key.)"
 msgstr ""

--- a/bridgedb/strings.py
+++ b/bridgedb/strings.py
@@ -181,9 +181,7 @@ bridge" field."""),
 EMAIL_COMMANDS = {
    "get bridges":          _("(Request unobfuscated Tor bridges.)"),
    "get ipv6":             _("(Request IPv6 bridges.)"),
-    # TRANSLATORS: Please DO NOT translate the word "TYPE".
-    "get transport TYPE":   _("(Request obfuscated bridges. Replace TYPE with "
-                              "'obfs4'.)"),
+    "get transport obfs4":  _("(Request obfs4 obfuscated bridges.)"),
    # TRANSLATORS: Please DO NOT translate "BridgeDB".
    # TRANSLATORS: Please DO NOT translate "GnuPG".
    "get key":              _("(Get a copy of BridgeDB's public GnuPG key.)"),