October 2019 - tor-commits - lists.torproject.org

[tpo/master] Update color info in jobs
by hiro＠torproject.org 21 Oct '19

21 Oct '19

commit 7bb83ee64487057ef868739081987b5001e729e4 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 18:03:10 2019 +0200 Update color info in jobs --- content/about/jobs/backend-engineer-ooni/contents.lr | 2 ++ content/about/jobs/browser-developer/contents.lr | 2 ++ content/about/jobs/developer-data-architect/contents.lr | 2 ++ content/about/jobs/senior-system-administrator/contents.lr | 2 ++ content/about/jobs/shadow-simulation-developer/contents.lr | 2 ++ 5 files changed, 10 insertions(+) diff --git a/content/about/jobs/backend-engineer-ooni/contents.lr b/content/about/jobs/backend-engineer-ooni/contents.lr index 280e9a5..21772ed 100644 --- a/content/about/jobs/backend-engineer-ooni/contents.lr +++ b/content/about/jobs/backend-engineer-ooni/contents.lr @@ -10,6 +10,8 @@ active: False --- title: Backend Engineer for OONI --- +color: primary +--- summary: The Tor Project, Inc. is looking for a dedicated backend engineer to work on OONI (https://ooni.torproject.org/) OONI is the Open Observatory of Network Interference: a free and open source software, global observation network for detecting censorship, surveillance, and traffic manipulation on the internet. diff --git a/content/about/jobs/browser-developer/contents.lr b/content/about/jobs/browser-developer/contents.lr index 8bbb489..888f4aa 100644 --- a/content/about/jobs/browser-developer/contents.lr +++ b/content/about/jobs/browser-developer/contents.lr @@ -10,6 +10,8 @@ section_id: about --- title: Browser Developer --- +color: primary +--- summary: The Tor Project is looking for a Browser Developer (C++ and Javascript)! diff --git a/content/about/jobs/developer-data-architect/contents.lr b/content/about/jobs/developer-data-architect/contents.lr index d3ec5e0..88706bb 100644 --- a/content/about/jobs/developer-data-architect/contents.lr +++ b/content/about/jobs/developer-data-architect/contents.lr @@ -8,6 +8,8 @@ active: False --- title: Developer Data Architect --- +color: primary +--- description: diff --git a/content/about/jobs/senior-system-administrator/contents.lr b/content/about/jobs/senior-system-administrator/contents.lr index 1598dae..113d4bf 100644 --- a/content/about/jobs/senior-system-administrator/contents.lr +++ b/content/about/jobs/senior-system-administrator/contents.lr @@ -8,6 +8,8 @@ section_id: about --- active: False --- +color: primary +--- title: Senior System Administrator --- summary: diff --git a/content/about/jobs/shadow-simulation-developer/contents.lr b/content/about/jobs/shadow-simulation-developer/contents.lr index 338da9b..8fe07b5 100644 --- a/content/about/jobs/shadow-simulation-developer/contents.lr +++ b/content/about/jobs/shadow-simulation-developer/contents.lr @@ -8,6 +8,8 @@ section: about --- section_id: about --- +color: primary +--- title: Shadow Simulation Developer --- summary:

1 0

[community/master] update content status
by antonela＠torproject.org 21 Oct '19

21 Oct '19

commit 1e624ba4452939bf3b78fdba217e60b51d0d5949 Author: Antonela <hola(a)antonela.me> Date: Mon Oct 21 13:02:33 2019 -0300 update content status --- content/user-research/become-tester/contents.lr | 2 +- content/user-research/guidelines/contents.lr | 2 +- content/user-research/open/contents.lr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 46b41fb..9540db2 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,6 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- -_hidden: yes +discoverable: no --- body: diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index 0958fe9..d6256ca 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,7 +8,7 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- -_hidden: yes +_discoverable: yes --- key: 3 --- diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index 252fbea..5aacad2 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -12,7 +12,7 @@ title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. --- -_hidden: yes +_discoverable: yes --- key: 2 ---

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 21 Oct '19

21 Oct '19

commit 43861d7fccc5dc037d86fd4dd19831e3fabdd73a Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 15:53:15 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+fr.po | 33 +++++++++++++++++---------------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/contents+fr.po b/contents+fr.po index 98fefc03a..6cc0fc4af 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -225,9 +225,9 @@ msgid "" "Installing new add-ons may affect Tor Browser in unforeseen ways and " "potentially make your Tor Browser fingerprint unique." msgstr "" -"L’installation de nouveaux modules pourrait affecter le Navigateur Tor de " -"façon imprévue et potentiellement rendre l’empreinte de votre Navigateur Tor" -" unique." +"L’installation de nouvelles extensions pourrait affecter le Navigateur Tor " +"de façon imprévue et potentiellement rendre l’empreinte de votre Navigateur " +"Tor unique." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -238,9 +238,9 @@ msgid "" "activities can be deanonymized and tracked even though you are using Tor " "Browser." msgstr "" -"Si votre installation du navigateur Tor possède une empreinte unique, votre " -"activité de navigation peut être rendue non-anonyme et tracée, même si vous " -"utilisez le navigateur Tor." +"Si l’empreinte de votre exemplaire du Navigateur Tor est unique, l’anonymat " +"de vos activités de navigation peut être levé et vos activités peuvent être " +"suivies à la trace même si vous utilisez le Navigateur Tor." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -250,8 +250,8 @@ msgid "" "Basically, each browser's settings and features create what is called a " "\"browser fingerprint\"." msgstr "" -"Fondamentalement, les réglages et fonctionnalités de chaque navigateur " -"permettent de créer ce que l'on appelle \"empreinte de navigateur\"." +"Essentiellement, les réglages et fonctions de chaque navigateur créent ce " +"que l’on appelle une « empreinte de navigateur »." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -261,8 +261,8 @@ msgid "" "Most browsers inadvertently create a unique fingerprint for each user which " "can be tracked across the internet." msgstr "" -"La plupart des navigateurs créent involontairement une empreinte unique pour" -" chaque utilisateur, qui peut être tracée sur Internet." +"La plupart des navigateurs créent par inadvertance une empreinte unique pour" +" chaque utilisateur, empreinte qui peut être suivie à la trace sur Internet." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -272,9 +272,9 @@ msgid "" "Tor Browser is specifically engineered to have a nearly identical (we're not" " perfect!) fingerprint across it's users." msgstr "" -"Le navigateur Tor est spécialement conçu pour avoir une empreinte de " -"navigateur quasiment identique (nous ne sommes pas parfaits !) pour tous ses" -" utilisateurs." +"Le Navigateur Tor est spécialement conçu pour présenter une empreinte " +"presque identique (nous ne sommes pas parfaits !) pour tous ses " +"utilisateurs." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description) @@ -4766,7 +4766,7 @@ msgstr "## A" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) msgid "### add-on, extension, or plugin" -msgstr "### extension, greffon ou addiciel" +msgstr "### greffon, extension ou addiciel" #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description) @@ -4774,8 +4774,9 @@ msgid "" "Add-ons, extensions, and plugins are components that can be added to [web " "browsers](#web-browser) to give them new features." msgstr "" -"Les extensions et greffons sont des composants qui peuvent être ajoutés à " -"des [navigateurs Web](#Web-browser) pour leur donner de nouvelles fonctions." +"Les extensions, greffons et addiciels sont des composants qui peuvent être " +"ajoutés à des [navigateurs Web](#Web-browser) pour leur donner de nouvelles " +"fonctions." #: https//support.torproject.org/misc/glossary/ #: (content/misc/glossary/contents+en.lrquestion.description)

1 0

[bridgedb/develop] Request translations for new string "Language".
by phw＠torproject.org 21 Oct '19

21 Oct '19

commit 1c529a20f1d1129dca78f8cf3fa3762de4e2a5fe Author: Philipp Winter <phw(a)nymity.ch> Date: Wed Oct 16 15:47:12 2019 -0700 Request translations for new string "Language". For our language switcher, we added the string "Language", for which we will need translations. This commit adds the string to bridgedb.pot, so it will end up in Transifex. --- bridgedb/i18n/templates/bridgedb.pot | 44 +++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/bridgedb/i18n/templates/bridgedb.pot b/bridgedb/i18n/templates/bridgedb.pot index c5ab8af..186ad6e 100644 --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@ -5,11 +5,11 @@ # msgid "" msgstr "" -"Project-Id-Version: bridgedb 0.8.0+15.gd9d886f.dirty\n" +"Project-Id-Version: bridgedb 0.9.0+0.g681963d.dirty\n" "Report-Msgid-Bugs-To: " "'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…" "=bridgedb-reported,msgid&cc=isis,sysrqb&owner=isis'\n" -"POT-Creation-Date: 2019-10-03 15:04-0700\n" +"POT-Creation-Date: 2019-10-16 11:13-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" @@ -33,7 +33,8 @@ msgstr "" #. 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. +#. : A list of supported language tuples. Use getSortedLangList() to read this +#. variable. #. 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 @@ -47,19 +48,23 @@ msgstr "" #. "fteproxy" #. "Tor" #. "Tor Browser" -#: bridgedb/distributors/https/server.py:135 +#: bridgedb/distributors/https/server.py:138 msgid "Sorry! Something went wrong with your request." msgstr "" -#: bridgedb/distributors/https/templates/base.html:79 +#: bridgedb/distributors/https/templates/base.html:42 +msgid "Language" +msgstr "" + +#: bridgedb/distributors/https/templates/base.html:92 msgid "Report a Bug" msgstr "" -#: bridgedb/distributors/https/templates/base.html:82 +#: bridgedb/distributors/https/templates/base.html:95 msgid "Source Code" msgstr "" -#: bridgedb/distributors/https/templates/base.html:85 +#: bridgedb/distributors/https/templates/base.html:98 msgid "Changelog" msgstr "" @@ -98,7 +103,8 @@ msgstr "" msgid "There currently aren't any bridges available..." msgstr "" -#: bridgedb/distributors/https/templates/bridges.html:132 +#: bridgedb/distributors/https/templates/bridges.html:133 +#: bridgedb/distributors/https/templates/bridges.html:137 #, python-format msgid " Perhaps you should try %s going back %s and choosing a different bridge type!" msgstr "" @@ -118,17 +124,19 @@ msgstr "" msgid "Step %s2%s" msgstr "" -#: bridgedb/distributors/https/templates/index.html:27 +#: bridgedb/distributors/https/templates/index.html:28 +#: bridgedb/distributors/https/templates/index.html:30 #, python-format msgid "Get %s bridges %s" msgstr "" -#: bridgedb/distributors/https/templates/index.html:36 +#: bridgedb/distributors/https/templates/index.html:40 #, python-format msgid "Step %s3%s" msgstr "" -#: bridgedb/distributors/https/templates/index.html:38 +#: bridgedb/distributors/https/templates/index.html:43 +#: bridgedb/distributors/https/templates/index.html:47 #, python-format msgid "Now %s add the bridges to Tor Browser %s" msgstr "" @@ -137,27 +145,27 @@ msgstr "" #. 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/distributors/https/templates/options.html:38 +#: bridgedb/distributors/https/templates/options.html:42 #, python-format msgid "%sJ%sust give me bridges!" msgstr "" -#: bridgedb/distributors/https/templates/options.html:51 +#: bridgedb/distributors/https/templates/options.html:55 msgid "Advanced Options" msgstr "" -#: bridgedb/distributors/https/templates/options.html:86 +#: bridgedb/distributors/https/templates/options.html:93 msgid "No" msgstr "" -#: bridgedb/distributors/https/templates/options.html:87 +#: bridgedb/distributors/https/templates/options.html:94 msgid "none" 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/distributors/https/templates/options.html:124 +#: bridgedb/distributors/https/templates/options.html:131 #, python-format msgid "%sY%ses!" msgstr "" @@ -165,7 +173,7 @@ 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/distributors/https/templates/options.html:147 +#: bridgedb/distributors/https/templates/options.html:154 #, python-format msgid "%sG%set Bridges" msgstr "" @@ -209,7 +217,7 @@ msgstr "" msgid "Hello, friend!" msgstr "" -#: bridgedb/distributors/https/templates/base.html:87 bridgedb/strings.py:58 +#: bridgedb/distributors/https/templates/base.html:100 bridgedb/strings.py:58 msgid "Public Keys" msgstr ""

1 0

[bridgedb/develop] Update instructions on requesting translations.
by phw＠torproject.org 21 Oct '19

21 Oct '19

commit ad2178a8ae2b6a2d8e7bb9fa229aa6b49fab3cd7 Author: Philipp Winter <phw(a)nymity.ch> Date: Thu Oct 17 14:09:16 2019 -0700 Update instructions on requesting translations. As far as I understand the process, it's not necessary to run 'update_catalog' when requesting new translations. We're requesting new translations by *only* updating bridgedb/i18n/templates/bridgedb.pot because it's the only file that Transifex pays attention to. Once our translators did their job, we're pulling the updated, language-specific .po files using the script maint/get-completed-translations. --- README.rst | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) diff --git a/README.rst b/README.rst index 4f05ea5..2576fa7 100644 --- a/README.rst +++ b/README.rst @@ -162,6 +162,10 @@ Enabling additional features Translations ------------ +For general information on the translation process, take a look at +`our translation guidelines for developers +<https://trac.torproject.org/projects/tor/wiki/doc/translation/developers>`__. + **Using New Translations**: This should be done when newly completed translations are available in @@ -180,31 +184,20 @@ This should be done whenever any of the strings requiring translation -- ``_("the ones inside the weird underscore function, like this")`` -- are changed, or new ones are added. See ``lib/bridgedb/strings.py``. -Translations for Tor Project repos are kept `in a separate -repo <https://gitweb.torproject.org/translation.git>`__. You'll need to -extract the strings from BridgeDB's source code into .pot templates, and -place these .po files into the ``translation`` repo in the ``bridgedb`` -branch. After than the .po files should be put into Transifex (don't ask -me how this works…) and translated. After the translations are complete, -the finished .po files should be placed into the ``bridgedb_completed`` -branch. - -- To extract all strings from BridgeDB's source:: +Translations for Tor Project repos are kept `in a separate repo +<https://gitweb.torproject.org/translation.git>`__. To request new or updated +translations, you'll need to extract the strings from BridgeDB's source code +into our ./i18n/templates/bridgedb.pot template, and then commit it to our +``develop`` branch. From there, the translation system takes over and +eventually, new translations will be available. To extract all strings from +BridgeDB's source, run:: python setup.py extract_messages - A .pot file will be created in ./i18n/templates/bridgedb.pot - - -- Initialise catalogs for each desired language:: - - python setup.py init_catalog -l LANG - - where ``LANG`` is the 2 or 4 letter country-code, eg. 'es'. If you've - already initialised a particular language, do instead:: - - python setup.py update_catalog - +Transifex uses the resulting file ./i18n/templates/bridgedb.pot (and this file +only) as input and fetches it from BridgeDB's ``develop`` branch, so we don't +need to release a new BridgeDB version (which we only do in the ``master`` +branch) to request translations. -------

1 0

[bridgedb/develop] Replace "Tor" with "Tor Browser" in UI.
by phw＠torproject.org 21 Oct '19

21 Oct '19

commit 61d86fbcdf03f19387feaf73c66e9869d34032d5 Author: Philipp Winter <phw(a)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&keywo…" "=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(a)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 = {

1 0

[bridgedb/develop] Merge branch 'task/32134' into develop
by phw＠torproject.org 21 Oct '19

21 Oct '19

commit b3cd9ac6d59a6f8ad1672518436d9e3d0ac2677f Merge: 681963d 61d86fb Author: Philipp Winter <phw(a)nymity.ch> Date: Mon Oct 21 08:42:34 2019 -0700 Merge branch 'task/32134' into develop CHANGELOG | 8 ++++ README.rst | 37 +++++++--------- bridgedb/i18n/templates/bridgedb.pot | 86 ++++++++++++++++++++---------------- bridgedb/strings.py | 6 ++- 4 files changed, 75 insertions(+), 62 deletions(-)

1 0

[community/master] Update user-research section to include hidden content
by hiro＠torproject.org 21 Oct '19

21 Oct '19

commit c7309bc6e56a51d5e648fc7990671b2d589de1e6 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 21 17:37:44 2019 +0200 Update user-research section to include hidden content --- content/user-research/become-tester/contents.lr | 4 +--- content/user-research/contents.lr | 2 ++ content/user-research/guidelines/contents.lr | 4 +--- content/user-research/open/contents.lr | 4 ++-- lego | 2 +- templates/two-columns-page.html | 2 +- templates/user-research.html | 4 ++-- 7 files changed, 10 insertions(+), 12 deletions(-) diff --git a/content/user-research/become-tester/contents.lr b/content/user-research/become-tester/contents.lr index 7025245..46b41fb 100644 --- a/content/user-research/become-tester/contents.lr +++ b/content/user-research/become-tester/contents.lr @@ -8,8 +8,6 @@ subtitle: We regularly release Tor Browser Alpha versions to allow users to test --- key: 1 --- -_template: layout.html ---- -html: two-columns-page.html +_hidden: yes --- body: diff --git a/content/user-research/contents.lr b/content/user-research/contents.lr index 2ad1aeb..e6fb45d 100644 --- a/content/user-research/contents.lr +++ b/content/user-research/contents.lr @@ -21,3 +21,5 @@ body: ## We respect our users' privacy when we conduct research. We practice human-centered design when we build tools for internet freedom. The way we build tools also builds community. Our user research is founded on the premises of consent, respect, and empathy. You can make an impact in your community by learning from our methods and helping us with user research. +--- +_discoverable: yes diff --git a/content/user-research/guidelines/contents.lr b/content/user-research/guidelines/contents.lr index a036343..0958fe9 100644 --- a/content/user-research/guidelines/contents.lr +++ b/content/user-research/guidelines/contents.lr @@ -8,12 +8,10 @@ title: User Research Guidelines --- subtitle: We collect only necessary data to improve our services. --- -hide: yes +_hidden: yes --- key: 3 --- -html: two-columns-page.html ---- body: Congrats! You're going to run your first User Research for Tor - and we are delighted to have you on board! diff --git a/content/user-research/open/contents.lr b/content/user-research/open/contents.lr index c1f5c1a..252fbea 100644 --- a/content/user-research/open/contents.lr +++ b/content/user-research/open/contents.lr @@ -12,9 +12,9 @@ title: Open User Research --- subtitle: We put our users in the center of our development process. That is how we bring privacy-enhancing technology to the ones who more need it. Explore what we are working on and start to run user research with your local community. --- -key: 2 +_hidden: yes --- -html: two-columns-page.html +key: 2 --- body: These are our current needs for testing Tor products, as well as methodologies and testing scripts. Before running Tor user research, be sure you read our [Guidelines to becoming a user researcher with Tor](https://community.torproject.org/user-research/guidelines). diff --git a/lego b/lego index 09c5813..a2e8d34 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 09c5813e895e67104dbdcf15bfec66367bd11790 +Subproject commit a2e8d340105281a2b7bbfe422a17f72e402ee1a8 diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html index 5151905..3c6832b 100644 --- a/templates/two-columns-page.html +++ b/templates/two-columns-page.html @@ -6,7 +6,7 @@ <div class="col-sm-12 col-xs-12 col-md-8 col-lg-8 pt-3 mr-auto {{ bag('alternatives', this.alt, 'order') }}"> {{ this.body }} <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in this.children.include_hidden(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> diff --git a/templates/user-research.html b/templates/user-research.html index e12fa62..7d6bd13 100644 --- a/templates/user-research.html +++ b/templates/user-research.html @@ -8,13 +8,13 @@ </div> </div> <div class="row"> - {% for child in this.children|sort(attribute='key') %} + {% for child in site.query(this.path).include_undiscoverable(true)|sort(attribute='key') %} <div class="col-sm-6 col-md-6 col-sm-12 col-xl-6 py-3"> <div class="card h-100"> <div class="card-body"> <div class="card-body"> <h4 class="card-title text-primary"> - <a href="{{ child.path|url(alt=this.alt) }}">{{ _(child.title) }}</a> + {{ _(child.title) }} </h4> <p class="card-text">{{ _(child.subtitle) }}</p> </div>

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 21 Oct '19

21 Oct '19

commit 61796f4d7450c0b74a82ad59da18ba2f4e58f3fd Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 15:23:22 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 37 ++++++++++++++++++++----------------- contents+fr.po | 9 +++++---- 2 files changed, 25 insertions(+), 21 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index e4bb4261d..b8b68f974 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -1,9 +1,9 @@ # Translators: # Marc Ripoll <markripesp(a)gmail.com>, 2019 +# erinm, 2019 # Aleix Vidal i Gaya <aleix.vidal(a)gmail.com>, 2019 # Emma Peel, 2019 # jmontane, 2019 -# erinm, 2019 # Ecron <ecron_89(a)hotmail.com>, 2019 # msgid "" @@ -883,6 +883,7 @@ msgstr "" msgid "" "Does Tor remove personal information from the data my application sends?" msgstr "" +"Elimina el Tor informació personal de les dades que la meva aplicació envia?" #: https//support.torproject.org/about/no-data-scrubbing/ #: (content/about/no-data-scrubbing/contents+en.lrquestion.description) @@ -912,12 +913,12 @@ msgstr "" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.title) msgid "What is Tor?" -msgstr "Què és Tor?" +msgstr "Què és el Tor?" #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) msgid "The name \"Tor\" can refer to several different components." -msgstr "El nom \"Tor\" pot fer referència a diversos components." +msgstr "El nom «Tor» pot fer referència a uns quants components diferents." #: https//support.torproject.org/about/what-is-tor/ #: (content/about/what-is-tor/contents+en.lrquestion.description) @@ -948,7 +949,7 @@ msgstr "" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.title) msgid "Why is it called Tor?" -msgstr "" +msgstr "Per què s'anomena Tor?" #: https//support.torproject.org/about/why-is-it-called-tor/ #: (content/about/why-is-it-called-tor/contents+en.lrquestion.description) @@ -1302,7 +1303,7 @@ msgid "" "Browser?" msgstr "" "Quins són els problemes més freqüents amb la versió estable més recent del " -"navegador Tor?" +"Navegador Tor?" #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -1310,9 +1311,9 @@ msgid "" "Whenever we release a new stable version of Tor Browser, we write a blog " "post that details its new features and known issues." msgstr "" -"Cada vegada que publiquem una nova versió estable del navegador Tor, " -"escrivim una publicació de blog que detalla les seves noves funcions i " -"problemes coneguts." +"Cada vegada que publiquem una versió estable nova del Navegador Tor, " +"escrivim una publicació que detalla les seves funcions i problemes coneguts " +"nous." #: https//support.torproject.org/tbb/tbb-1/ #: (content/tbb/tbb-1/contents+en.lrquestion.description) @@ -1339,8 +1340,8 @@ msgid "" "My antivirus or malware protection is blocking me from accessing Tor " "Browser." msgstr "" -"El meu antivirus o protecció de programari maliciós m'està blocant l'accés " -"al navegador Tor." +"El meu antivirus o protecció contra programari maliciós m'està blocant " +"l'accés al Navegador Tor." #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -1348,9 +1349,9 @@ msgid "" "Most antivirus or malware protection allows the user to \"whitelist\" " "certain processes that would otherwise be blocked." msgstr "" -"La majoria de la protecció antivirus o de programari maliciós permet a " -"l'usuari \"llistes blanques\" certs processos que d'una altra forma serien " -"blocats." +"La majoria dels antivirus o proteccions contra programari maliciós permeten " +"a l'usuari posar en una «llista blanca» certs processos que d'una altra " +"forma es blocarien." #: https//support.torproject.org/tbb/tbb-10/ #: (content/tbb/tbb-10/contents+en.lrquestion.description) @@ -1477,7 +1478,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.title) msgid "Can I use Flash in Tor Browser?" -msgstr "Puc utilitzar Flash al navegador Tor?" +msgstr "Puc utilitzar el Flash en el Navegador Tor?" #: https//support.torproject.org/tbb/tbb-12/ #: (content/tbb/tbb-12/contents+en.lrquestion.description) @@ -1508,7 +1509,9 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.title) msgid "Does using Tor Browser protect other applications on my computer?" -msgstr "El navegador Tor pot protegir altres aplicacions del meu equip?" +msgstr "" +"Es protegeixen altres aplicacions del meu equip en utilitzar el Navegador " +"Tor?" #: https//support.torproject.org/tbb/tbb-13/ #: (content/tbb/tbb-13/contents+en.lrquestion.description) @@ -1547,7 +1550,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-15/ #: (content/tbb/tbb-15/contents+en.lrquestion.title) msgid "Can I download Tor Browser for Chrome OS?" -msgstr "Puc baixar el navegador Tor per al Chrome OS?" +msgstr "Puc baixar el Navegador Tor per al Chrome OS?" #: https//support.torproject.org/tbb/tbb-15/ #: (content/tbb/tbb-15/contents+en.lrquestion.description) @@ -1576,7 +1579,7 @@ msgstr "" #: https//support.torproject.org/tbb/tbb-16/ #: (content/tbb/tbb-16/contents+en.lrquestion.title) msgid "Can I pick which country I'm exiting from?" -msgstr "Puc escollir de quin país surt la connexió?" +msgstr "Puc triar de quin país surt la connexió?" #: https//support.torproject.org/tbb/tbb-16/ #: (content/tbb/tbb-16/contents+en.lrquestion.description) diff --git a/contents+fr.po b/contents+fr.po index 825d52a3d..98fefc03a 100644 --- a/contents+fr.po +++ b/contents+fr.po @@ -5,8 +5,8 @@ # David Georges, 2019 # erinm, 2019 # N W, 2019 -# AO <ao(a)localizationlab.org>, 2019 # karanbole, 2019 +# AO <ao(a)localizationlab.org>, 2019 # msgid "" msgstr "" @@ -14,7 +14,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-09-26 17:56+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: karanbole, 2019\n" +"Last-Translator: AO <ao(a)localizationlab.org>, 2019\n" "Language-Team: French (https://www.transifex.com/otf/teams/1519/fr/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -225,8 +225,9 @@ msgid "" "Installing new add-ons may affect Tor Browser in unforeseen ways and " "potentially make your Tor Browser fingerprint unique." msgstr "" -"L'installation de nouveaux modules peut affecter le navigateur Tor de façon " -"imprévisible et potentiellement rendre votre empreinte de navigateur unique." +"L’installation de nouveaux modules pourrait affecter le Navigateur Tor de " +"façon imprévue et potentiellement rendre l’empreinte de votre Navigateur Tor" +" unique." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.description)

1 0

[translation/support-portal] https://gitweb.torproject.org/translation.git/commit/?h=support-portal
by translation＠torproject.org 21 Oct '19

21 Oct '19

commit 2a112aa529e33f723b39fd7e27f3a8c3217b0545 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Oct 21 14:53:23 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+ca.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/contents+ca.po b/contents+ca.po index 66026442d..e4bb4261d 100644 --- a/contents+ca.po +++ b/contents+ca.po @@ -187,8 +187,8 @@ msgid "" "manual.torproject.org/circumvention/)" msgstr "" "Per a obtenir més informació, consulteu la secció de [censura](https://tb-" -"manual.torproject.org/circumvention/) del [manual d’usuari del Navegador " -"Tor](https://tb-manual.torproject.org/)." +"manual.torproject.org/ca/circumvention/) del [manual d’usuari del Navegador " +"Tor](https://tb-manual.torproject.org/ca/)." #: https//support.torproject.org/faq/faq-3/ #: (content/faq/faq-3/contents+en.lrquestion.title) @@ -540,7 +540,7 @@ msgstr "" #: https//support.torproject.org/about/can-i-use-tor-with/ #: (content/about/can-i-use-tor-with/contents+en.lrquestion.title) msgid "What programs can I use with Tor?" -msgstr "Quins programes puc utilitzaar amb el Tor?" +msgstr "Quins programes puc utilitzar amb el Tor?" #: https//support.torproject.org/about/can-i-use-tor-with/ #: (content/about/can-i-use-tor-with/contents+en.lrquestion.description) @@ -7426,7 +7426,7 @@ msgstr "Col·laboradors d'aquesta pàgina:" #: templates/macros/question.html:18 msgid "Edit this page" -msgstr "Edita la pàgina" +msgstr "Editeu la pàgina" #: templates/macros/question.html:19 msgid "Suggest Feedback" @@ -7434,4 +7434,4 @@ msgstr "Suggeriu comentaris" #: templates/macros/question.html:20 msgid "Permalink" -msgstr "Permalink" +msgstr "Enllaç permanent"

1 0