commit 61d86fbcdf03f19387feaf73c66e9869d34032d5 Author: Philipp Winter <phw@nymity.ch> Date: Sat Oct 19 14:49:38 2019 -0700 Replace "Tor" with "Tor Browser" in UI. Also, add instructions for our translators. --- CHANGELOG | 8 +++++++ bridgedb/i18n/templates/bridgedb.pot | 46 +++++++++++++++++++----------------- bridgedb/strings.py | 6 +++-- 3 files changed, 36 insertions(+), 24 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 6ab617e..5b6dce6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,11 @@ +Changes in version A.B.C - YYYY-MM-DD + + * FIXES https://bugs.torproject.org/32134 + While implementing our language switcher (#26543), we added a new + string, "Language", that requires translations. This patch adds a new + translation request and also updates our instructions on how to request + new translations. + Changes in version 0.9.0 - 2019-10-16 * FIXES https://bugs.torproject.org/26543 diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index 186ad6e..7e16c26 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.9.0+0.g681963d.dirty\n" +"Project-Id-Version: bridgedb 0.9.0+3.gfd0c28d.dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywor..." "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2019-10-16 11:13-0700\n" +"POT-Creation-Date: 2019-10-19 14:51-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" @@ -296,47 +296,49 @@ msgstr "" msgid "My bridges don't work! I need help!" msgstr "" -#. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:117 +#. 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 #, python-format -msgid "If your Tor cannot connect, please take a look at the %s and our %s." +msgid "If your Tor Browser cannot connect, please take a look at the %s and our %s." msgstr "" -#: bridgedb/strings.py:121 +#: bridgedb/strings.py:123 msgid "Here are your bridge lines:" msgstr "" -#: bridgedb/strings.py:122 +#: bridgedb/strings.py:124 msgid "Get Bridges!" msgstr "" -#: bridgedb/strings.py:126 +#: bridgedb/strings.py:128 msgid "Please select options for bridge type:" msgstr "" -#: bridgedb/strings.py:127 +#: bridgedb/strings.py:129 msgid "Do you need IPv6 addresses?" msgstr "" -#: bridgedb/strings.py:128 +#: bridgedb/strings.py:130 #, python-format msgid "Do you need a %s?" msgstr "" -#: bridgedb/strings.py:132 +#: bridgedb/strings.py:134 msgid "Your browser is not displaying images properly." msgstr "" -#: bridgedb/strings.py:133 +#: bridgedb/strings.py:135 msgid "Enter the characters from the image above..." msgstr "" -#: bridgedb/strings.py:137 +#: bridgedb/strings.py:139 msgid "How to start using your bridges" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor Browser". -#: bridgedb/strings.py:139 +#: bridgedb/strings.py:141 #, python-format msgid "" "To enter bridges into Tor Browser, first go to the %s Tor Browser download\n" @@ -345,7 +347,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:144 +#: bridgedb/strings.py:146 msgid "" "When the 'Tor Network Settings' dialogue pops up, click 'Configure' and " "follow\n" @@ -353,7 +355,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:148 +#: bridgedb/strings.py:150 msgid "" "Does your Internet Service Provider (ISP) block or otherwise censor " "connections\n" @@ -361,7 +363,7 @@ msgid "" msgstr "" #. TRANSLATORS: Please DO NOT translate "Tor". -#: bridgedb/strings.py:152 +#: bridgedb/strings.py:154 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" @@ -370,29 +372,29 @@ msgid "" "button in the 'Tor Network Settings' wizard for further assistance." msgstr "" -#: bridgedb/strings.py:160 +#: bridgedb/strings.py:162 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:164 +#: bridgedb/strings.py:166 msgid "Request vanilla bridges." msgstr "" -#: bridgedb/strings.py:165 +#: bridgedb/strings.py:167 msgid "Request IPv6 bridges." msgstr "" #. TRANSLATORS: Please DO NOT translate the word the word "TYPE". -#: bridgedb/strings.py:167 +#: bridgedb/strings.py:169 msgid "Request a Pluggable Transport by TYPE." msgstr "" #. TRANSLATORS: Please DO NOT translate "BridgeDB". #. TRANSLATORS: Please DO NOT translate "GnuPG". -#: bridgedb/strings.py:170 +#: bridgedb/strings.py:172 msgid "Get a copy of BridgeDB's public GnuPG key." msgstr "" diff --git a/bridgedb/strings.py b/bridgedb/strings.py index 2a83751..f6e2d69 100644 --- a/bridgedb/strings.py +++ b/bridgedb/strings.py @@ -113,8 +113,10 @@ send the email using an address from one of the following email providers: HELP = { 0: _("My bridges don't work! I need help!"), - # TRANSLATORS: Please DO NOT translate "Tor". - 1: _("""If your Tor cannot connect, please take a look at the %s and our %s."""), + # TRANSLATORS: Please DO NOT translate "Tor Browser". + # TRANSLATORS: The two '%s' are substituted with "Tor Browser Manual" and + # "Support Portal", respectively. + 1: _("""If your Tor Browser cannot connect, please take a look at the %s and our %s."""), } BRIDGES = {