November 2020 - tor-commits - lists.torproject.org

[dev/staging] Make it build
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit 7a699899bbcb39ff393bfa394a482b50e7a74e10 Author: hiro <hiro(a)torproject.org> Date: Tue Nov 24 19:14:33 2020 +0100 Make it build --- configs/i18n.ini | 2 +- i18n/contents.pot | 913 +++++++++++++++++++++++++++++++++++++++++++++++- templates/banner.html | 1 + templates/training.html | 35 ++ 4 files changed, 940 insertions(+), 11 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index 44cc604..1786098 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = es,de,fr,it,pt-BR,ru +translations = en i18npath = i18n translate_paragraphwise = False url_prefix = https://dev.torproject.org/ diff --git a/i18n/contents.pot b/i18n/contents.pot index c5af5b5..33e35bd 100644 --- a/i18n/contents.pot +++ b/i18n/contents.pot @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2019-10-17 20:36+CET\n" +"POT-Creation-Date: 2020-11-24 19:14+CET\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Language-Team: en <LL(a)li.org>\n" @@ -12,26 +12,919 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" #: https://dev.torproject.org/ (content/contents+en.lr:page.title) -msgid "The Tor Ecosystem" +msgid "The Tor Developers Portal" msgstr "" #: https://dev.torproject.org/ (content/contents+en.lr:page.subtitle) -msgid "Tor protects you by bounsing your communications around a distributed network of relays run by volunteers all around the world." +msgid "a subtitle" msgstr "" #: https://dev.torproject.org/ (content/contents+en.lr:page.body) -msgid "The Tor community is made up of all kinds of contributors." +msgid "an overview of the portal" msgstr "" -#: https://dev.torproject.org/ (content/contents+en.lr:page.body) -msgid "Some people write documentation and bug reports, while others hold Tor events and conduct outreach." +#: https://dev.torproject.org/tor-ecosystem/ +#: (content/tor-ecosystem/contents+en.lr:page.title) +msgid "The Tor Ecosystem" msgstr "" -#: https://dev.torproject.org/ (content/contents+en.lr:page.body) -msgid "Whether you have a lot of time to volunteer or a little, and whether you consider yourself technical or not, we want you to join our community, too." +#: https://dev.torproject.org/tor-ecosystem/ +#: (content/tor-ecosystem/contents+en.lr:page.subtitle) +msgid "" +"Applications that use tor: Ones we maintain, like Tor Browser, and selected " +"others that we love" msgstr "" -#: https://dev.torproject.org/ (content/contents+en.lr:page.body) -msgid "Below you'll find some different ways to volunteer with the Tor community as well as resources to help you help Tor." +#: https://dev.torproject.org/tor-ecosystem/ +#: (content/tor-ecosystem/contents+en.lr:page.cta) +#: https://dev.torproject.org/tor-network/ +#: (content/tor-network/contents+en.lr:page.cta) +#: https://dev.torproject.org/understanding-tor/ +#: (content/understanding-tor/contents+en.lr:page.cta) +#: https://dev.torproject.org/tor-ecosystem/tor-browser/ +#: (content/tor-ecosystem/tor-browser/contents+en.lr:page.cta) +msgid "Call To Action" +msgstr "" + +#: https://dev.torproject.org/tor-ecosystem/ +#: (content/tor-ecosystem/contents+en.lr:page.body) +#: https://dev.torproject.org/observing-tor/ +#: (content/observing-tor/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-network/ +#: (content/tor-network/contents+en.lr:page.body) +#: https://dev.torproject.org/understanding-tor/ +#: (content/understanding-tor/contents+en.lr:page.body) +#: https://dev.torproject.org/hacking-on-tor/ +#: (content/hacking-on-tor/contents+en.lr:page.body) +#: https://dev.torproject.org/manage-tor/ +#: (content/manage-tor/contents+en.lr:page.body) +#: https://dev.torproject.org/fighting-censorship/ +#: (content/fighting-censorship/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-ecosystem/tor-browser/ +#: (content/tor-ecosystem/tor-browser/contents+en.lr:page.body) +msgid "the overview" +msgstr "" + +#: https://dev.torproject.org/tor-ecosystem/ +#: (content/tor-ecosystem/contents+en.lr:page.body) +msgid ">>>>>>> anto/master" +msgstr "" + +#: https://dev.torproject.org/project-ideas/ +#: (content/project-ideas/contents+en.lr:page.title) +msgid "Project Ideas" +msgstr "" + +#: https://dev.torproject.org/project-ideas/ +#: (content/project-ideas/contents+en.lr:page.subtitle) +msgid "Some project ideas for GSoC." +msgstr "" + +#: https://dev.torproject.org/project-ideas/ +#: (content/project-ideas/contents+en.lr:page.cta) +msgid "Get coding" +msgstr "" + +#: https://dev.torproject.org/project-ideas/ +#: (content/project-ideas/contents+en.lr:page.body) +msgid "" +"You may find some of these projects to be good ideas for Google Summer of " +"Code. We have labelled each idea with which of our core developers would be " +"good mentors. If one or more of these ideas looks promising to you, please " +"[contact us](mailto:gso+c@torproject.org) to discuss your plans rather than " +"sending blind applications." +msgstr "" + +#: https://dev.torproject.org/observing-tor/ +#: (content/observing-tor/contents+en.lr:page.title) +msgid "Observing the Tor network" +msgstr "" + +#: https://dev.torproject.org/observing-tor/ +#: (content/observing-tor/contents+en.lr:page.subtitle) +msgid "Tools for researching, inspecting and managing the tor network" +msgstr "" + +#: https://dev.torproject.org/observing-tor/ +#: (content/observing-tor/contents+en.lr:page.cta) +#: https://dev.torproject.org/hacking-on-tor/ +#: (content/hacking-on-tor/contents+en.lr:page.cta) +#: https://dev.torproject.org/manage-tor/ +#: (content/manage-tor/contents+en.lr:page.cta) +#: https://dev.torproject.org/fighting-censorship/ +#: (content/fighting-censorship/contents+en.lr:page.cta) +msgid "Call to Action" +msgstr "" + +#: https://dev.torproject.org/tor-network/ +#: (content/tor-network/contents+en.lr:page.title) +msgid "The Tor Network" +msgstr "" + +#: https://dev.torproject.org/tor-network/ +#: (content/tor-network/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/understanding-tor/ +#: (content/understanding-tor/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/tor-ecosystem/onionshare/ +#: (content/tor-ecosystem/onionshare/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/observing-tor/sbws/ +#: (content/observing-tor/sbws/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/observing-tor/exitscanner/ +#: (content/observing-tor/exitscanner/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/observing-tor/metrics/ +#: (content/observing-tor/metrics/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/tor-network/tor/ +#: (content/tor-network/tor/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/tor-network/tor-protocol/ +#: (content/tor-network/tor-protocol/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/tor-network/tor-design/ +#: (content/tor-network/tor-design/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/hacking-on-tor/research/ +#: (content/hacking-on-tor/research/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/hacking-on-tor/writing-documentation/ +#: (content/hacking-on-tor/writing-documentation/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/hacking-on-tor/hacking-tor/ +#: (content/hacking-on-tor/hacking-tor/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/manage-tor/nyx/ +#: (content/manage-tor/nyx/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/fighting-censorship/ooni/ +#: (content/fighting-censorship/ooni/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/fighting-censorship/get-tor/ +#: (content/fighting-censorship/get-tor/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/fighting-censorship/pluggable-transports/ +#: (content/fighting-censorship/pluggable-transports/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/fighting-censorship/bridges/ +#: (content/fighting-censorship/bridges/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/tor-ecosystem/tor-browser/tor-browser/ +#: (content/tor-ecosystem/tor-browser/tor-browser/contents+en.lr:page.subtitle) +#: https://dev.torproject.org/tor-ecosystem/tor-browser/tor-browser-android/ +#: (content/tor-ecosystem/tor-browser/tor-browser-android/contents+en.lr:page.subtitle) +msgid "a two lines subtitle" +msgstr "" + +#: https://dev.torproject.org/understanding-tor/ +#: (content/understanding-tor/contents+en.lr:page.title) +msgid "Understanding Tor" +msgstr "" + +#: https://dev.torproject.org/hacking-on-tor/ +#: (content/hacking-on-tor/contents+en.lr:page.title) +msgid "Hacking Tor" +msgstr "" + +#: https://dev.torproject.org/hacking-on-tor/ +#: (content/hacking-on-tor/contents+en.lr:page.subtitle) +msgid "How can I help?" +msgstr "" + +#: https://dev.torproject.org/manage-tor/ +#: (content/manage-tor/contents+en.lr:page.title) +msgid "Manage Tor" +msgstr "" + +#: https://dev.torproject.org/manage-tor/ +#: (content/manage-tor/contents+en.lr:page.subtitle) +msgid "" +"Managing your tor installation. helpful tools for the advanced relay or " +"onion service operator" +msgstr "" + +#: https://dev.torproject.org/metrics/ +#: (content/metrics/contents+en.lr:page.title) +msgid "Metrics Team" +msgstr "" + +#: https://dev.torproject.org/metrics/ +#: (content/metrics/contents+en.lr:page.subtitle) +msgid "" +"The Metrics Team is a group of Tor people who care about measuring and " +"analyzing things in the public Tor network." +msgstr "" + +#: https://dev.torproject.org/metrics/ +#: (content/metrics/contents+en.lr:page.body) +msgid "Welcome to the Metrics Team page!" +msgstr "" + +#: https://dev.torproject.org/metrics/ +#: (content/metrics/contents+en.lr:page.body) +msgid "" +"The Metrics Team is a group of Tor people who care about measuring and " +"analyzing things in the public Tor network. If you're interested in " +"measurements and analyses, the Metrics Team is what you're looking for. " +"Welcome!" +msgstr "" + +#: https://dev.torproject.org/fighting-censorship/ +#: (content/fighting-censorship/contents+en.lr:page.title) +msgid "Fighting Censorship" +msgstr "" + +#: https://dev.torproject.org/fighting-censorship/ +#: (content/fighting-censorship/contents+en.lr:page.subtitle) +msgid "Deliver Tor to censored users" msgstr "" +#: https://dev.torproject.org/network/ +#: (content/network/contents+en.lr:page.title) +msgid "Network Team" +msgstr "" + +#: https://dev.torproject.org/network/ +#: (content/network/contents+en.lr:page.subtitle) +msgid "" +"The Network Team is a group of Tor people who are working on the Tor back-" +"end." +msgstr "" + +#: https://dev.torproject.org/network/ +#: (content/network/contents+en.lr:page.body) +msgid "Welcome to the Network Team page!" +msgstr "" + +#: https://dev.torproject.org/network/ +#: (content/network/contents+en.lr:page.body) +msgid "## What we do" +msgstr "" + +#: https://dev.torproject.org/network/ +#: (content/network/contents+en.lr:page.body) +msgid "" +"The Network Team is a group of Tor people who are working on Tor back-end: " +"the program called tor, the network simulators, the scripts that support " +"directory authorities, onion services, etc. Basically, everything that sends " +"and receives bytes from the network." +msgstr "" + +#: https://dev.torproject.org/anti-censorship/ +#: (content/anti-censorship/contents+en.lr:page.title) +msgid "Anti-Censorship Team" +msgstr "" + +#: https://dev.torproject.org/anti-censorship/ +#: (content/anti-censorship/contents+en.lr:page.subtitle) +msgid "" +"The anti-censorship team is a group of Tor people who make Tor reachable " +"anywhere in the world." +msgstr "" + +#: https://dev.torproject.org/anti-censorship/ +#: (content/anti-censorship/contents+en.lr:page.body) +msgid "Welcome to the anti-censorship team page!" +msgstr "" + +#: https://dev.torproject.org/anti-censorship/ +#: (content/anti-censorship/contents+en.lr:page.body) +msgid "" +"The anti-censorship team is a group of Tor people who make Tor reachable " +"anywhere in the world. We analyze censorship attempts and develop technology " +"to work around these censorship attempts." +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.title) +msgid "Network Health Team" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.subtitle) +msgid "" +"The Network Health Team coordinates network performance and scalability work " +"as well as other network health related tasks." +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "Welcome to the Network Health Team page!" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "The team was created on January 2020 and it works on these five areas:" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "1. track community standards about what makes a good relay" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- publish up-to-date expectations for relay operators" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- set best practices for how to set relay families" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- detect and resolve bad relays" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- exitmap, sybil detection, hsdir traps" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "2. anomaly analysis / network health engineer [with network team]" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- establish baselines of expected network behavior" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- look for and resolve denial of service issues" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- track connectivity issues between relays" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- look for relays hitting resource limits" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "3. make sure usage/growth stats are collected and accurate" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- track network performance, relay diversity by various metrics" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- count users [with network team and metrics team]" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- monitor bridge growth and usage [with censorship team]" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "4. relay advocacy [with community team]" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- maintain docs for setting up and running relays and bridges" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- grow a cohesive community of relay operators so they have peers" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- keep relays on the right tor versions" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "" +"- relaunch a gamification / badge system for lauding good relay progress" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- strengthen relationships with non-profit orgs that run relays" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- help companies that want to offset their tor network load" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "5. maintain the components of the network" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- maintain directory authority relationships" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "" +"- keep bandwidth authorities working (including setting the right balance " +"between speed and location diversity)" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "" +"- have enough tor browser default bridges, and keep them running smoothly " +"[with censorship team]" +msgstr "" + +#: https://dev.torproject.org/network-health/ +#: (content/network-health/contents+en.lr:page.body) +msgid "- update the fallbackdirs list" +msgstr "" + +#: https://dev.torproject.org/applications/ +#: (content/applications/contents+en.lr:page.title) +msgid "Applications Team" +msgstr "" + +#: https://dev.torproject.org/applications/ +#: (content/applications/contents+en.lr:page.subtitle) +msgid "" +"The Applications Team is a group of Tor people who are working on different " +"user facing products." +msgstr "" + +#: https://dev.torproject.org/applications/ +#: (content/applications/contents+en.lr:page.body) +msgid "Welcome to the Applications Team page." +msgstr "" + +#: https://dev.torproject.org/applications/ +#: (content/applications/contents+en.lr:page.body) +msgid "" +"The Applications Team is a group of Tor people who are working on different " +"user facing products: Tor Browser, Tor Messenger, Tor Mail, Orbot etc." +msgstr "" + +#: https://dev.torproject.org/tor-ecosystem/tor-browser/ +#: (content/tor-ecosystem/tor-browser/contents+en.lr:page.title) +#: https://dev.torproject.org/tor-ecosystem/tor-browser/tor-browser/ +#: (content/tor-ecosystem/tor-browser/tor-browser/contents+en.lr:page.title) +msgid "Tor Browser" +msgstr "" + +#: https://dev.torproject.org/tor-ecosystem/tor-browser/ +#: (content/tor-ecosystem/tor-browser/contents+en.lr:page.subtitle) +msgid "Tor Browser subtitle" +msgstr "" + +#: https://dev.torproject.org/tor-ecosystem/onionshare/ +#: (content/tor-ecosystem/onionshare/contents+en.lr:page.title) +msgid "Onionshare" +msgstr "" + +#: https://dev.torproject.org/tor-ecosystem/onionshare/ +#: (content/tor-ecosystem/onionshare/contents+en.lr:page.body) +#: https://dev.torproject.org/observing-tor/sbws/ +#: (content/observing-tor/sbws/contents+en.lr:page.body) +#: https://dev.torproject.org/observing-tor/exitscanner/ +#: (content/observing-tor/exitscanner/contents+en.lr:page.body) +#: https://dev.torproject.org/observing-tor/metrics/ +#: (content/observing-tor/metrics/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-network/tor/ +#: (content/tor-network/tor/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-network/tor-protocol/ +#: (content/tor-network/tor-protocol/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-network/dev-tools/ +#: (content/tor-network/dev-tools/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-network/tor-design/ +#: (content/tor-network/tor-design/contents+en.lr:page.body) +#: https://dev.torproject.org/hacking-on-tor/research/ +#: (content/hacking-on-tor/research/contents+en.lr:page.body) +#: https://dev.torproject.org/hacking-on-tor/writing-documentation/ +#: (content/hacking-on-tor/writing-documentation/contents+en.lr:page.body) +#: https://dev.torproject.org/hacking-on-tor/hacking-tor/ +#: (content/hacking-on-tor/hacking-tor/contents+en.lr:page.body) +#: https://dev.torproject.org/manage-tor/nyx/ +#: (content/manage-tor/nyx/contents+en.lr:page.body) +#: https://dev.torproject.org/fighting-censorship/ooni/ +#: (content/fighting-censorship/ooni/contents+en.lr:page.body) +#: https://dev.torproject.org/fighting-censorship/get-tor/ +#: (content/fighting-censorship/get-tor/contents+en.lr:page.body) +#: https://dev.torproject.org/fighting-censorship/pluggable-transports/ +#: (content/fighting-censorship/pluggable-transports/contents+en.lr:page.body) +#: https://dev.torproject.org/fighting-censorship/bridges/ +#: (content/fighting-censorship/bridges/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-ecosystem/tor-browser/tor-browser/ +#: (content/tor-ecosystem/tor-browser/tor-browser/contents+en.lr:page.body) +#: https://dev.torproject.org/tor-ecosystem/tor-browser/tor-browser-android/ +#: (content/tor-ecosystem/tor-browser/tor-browser-android/contents+en.lr:page.body) +msgid "the content" +msgstr "" + +#: https://dev.torproject.org/observing-tor/sbws/ +#: (content/observing-tor/sbws/contents+en.lr:page.title) +msgid "SBWS" +msgstr "" + +#: https://dev.torproject.org/observing-tor/exitscanner/ +#: (content/observing-tor/exitscanner/contents+en.lr:page.title) +msgid "Exitscanner" +msgstr "" + +#: https://dev.torproject.org/observing-tor/metrics/ +#: (content/observing-tor/metrics/contents+en.lr:page.title) +msgid "Metrics" +msgstr "" + +#: https://dev.torproject.org/tor-network/tor/ +#: (content/tor-network/tor/contents+en.lr:page.title) +msgid "tor, The tor program" +msgstr "" + +#: https://dev.torproject.org/tor-network/tor-protocol/ +#: (content/tor-network/tor-protocol/contents+en.lr:page.title) +msgid "The Tor Protocol" +msgstr "" + +#: https://dev.torproject.org/tor-network/dev-tools/ +#: (content/tor-network/dev-tools/contents+en.lr:page.title) +msgid "Developer Tools" +msgstr "" + +#: https://dev.torproject.org/tor-network/dev-tools/ +#: (content/tor-network/dev-tools/contents+en.lr:page.subtitle) +msgid "Development tools used to help make tor" +msgstr "" + +#: https://dev.torproject.org/tor-network/dev-tools/ +#: (content/tor-network/dev-tools/contents+en.lr:page.body) +msgid "Trunnel" +msgstr "" + +#: https://dev.torproject.org/tor-network/dev-tools/ +#: (content/tor-network/dev-tools/contents+en.lr:page.body) +msgid "Chutney" +msgstr "" + +#: https://dev.torproject.org/tor-network/dev-tools/ +#: (content/tor-network/dev-tools/contents+en.lr:page.body) +msgid "Other Tor implementations (?)" +msgstr "" + +#: https://dev.torproject.org/tor-network/dev-tools/ +#: (content/tor-network/dev-tools/contents+en.lr:page.body) +msgid "How to write a tor client (?)" +msgstr "" + +#: https://dev.torproject.org/tor-network/tor-design/ +#: (content/tor-network/tor-design/contents+en.lr:page.title) +msgid "The Tor design" +msgstr "" + +#: https://dev.torproject.org/hacking-on-tor/research/ +#: (content/hacking-on-tor/research/contents+en.lr:page.title) +msgid "research.torproject.org" +msgstr "" + +#: https://dev.torproject.org/hacking-on-tor/writing-documentation/ +#: (content/hacking-on-tor/writing-documentation/contents+en.lr:page.title) +msgid "Writing dev documentation" +msgstr "" + +#: https://dev.torproject.org/hacking-on-tor/hacking-tor/ +#: (content/hacking-on-tor/hacking-tor/contents+en.lr:page.title) +msgid "Hacking on Tor Software" +msgstr "" + +#: https://dev.torproject.org/manage-tor/onion-balance/ +#: (content/manage-tor/onion-balance/contents+en.lr:page.title) +msgid "OnionBalance" +msgstr "" + +#: https://dev.torproject.org/manage-tor/onion-balance/ +#: (content/manage-tor/onion-balance/contents+en.lr:page.subtitle) +msgid "" +"OnionBalance is the best way to load balance onion services across multiple " +"backend Tor instances." +msgstr "" + +#: https://dev.torproject.org/manage-tor/onion-balance/ +#: (content/manage-tor/onion-balance/contents+en.lr:page.body) +msgid "" +"OnionBalance is the best way to load balance onion services across multiple " +"backend Tor instances. This way the load of introduction and rendezvous " +"requests get distributed across multiple hosts. OnionBalance provides load-" +"balancing while also making onion services more resilient and reliable by " +"eliminating single points-of-failure." +msgstr "" + +#: https://dev.torproject.org/manage-tor/nyx/ +#: (content/manage-tor/nyx/contents+en.lr:page.title) +msgid "Nyx" +msgstr "" + +#: https://dev.torproject.org/fighting-censorship/ooni/ +#: (content/fighting-censorship/ooni/contents+en.lr:page.title) +msgid "OONI" +msgstr "" + +#: https://dev.torproject.org/fighting-censorship/get-tor/ +#: (content/fighting-censorship/get-tor/contents+en.lr:page.title) +msgid "Get Tor" +msgstr "" + +#: https://dev.torproject.org/fighting-censorship/pluggable-transports/ +#: (content/fighting-censorship/pluggable-transports/contents+en.lr:page.title) +msgid "Pluggable Transports" +msgstr "" + +#: https://dev.torproject.org/fighting-censorship/bridges/ +#: (content/fighting-censorship/bridges/contents+en.lr:page.title) +msgid "Bridges" +msgstr "" + +#: https://dev.torproject.org/tor-ecosystem/tor-browser/tor-browser-android/ +#: (content/tor-ecosystem/tor-browser/tor-browser-android/contents+en.lr:page.title) +msgid "Tor Browser for Android" +msgstr "" + +#: lego/templates/banner.html:3 lego/templates/banner.html:5 +#: templates/banner.html:3 templates/banner.html:5 +msgid "Close banner" +msgstr "" + +#: lego/templates/banner.html:11 templates/banner.html:11 +msgid "Use a Mask, Use Tor." +msgstr "" + +#: lego/templates/banner.html:20 templates/banner.html:20 +msgid "Resist the surveillance pandemic." +msgstr "" + +#: lego/templates/banner.html:32 templates/banner.html:32 +msgid "Your donation will be matched by Friends of Tor, up to $100,000." +msgstr "" + +#: lego/templates/banner.html:38 lego/templates/footer.html:64 +#: lego/templates/footer.html:66 lego/templates/navbar.html:19 +#: lego/templates/navbar.html:21 templates/banner.html:38 +#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:19 +#: templates/navbar.html:21 +msgid "Donate Now" +msgstr "" + +#: lego/templates/banner.html:40 templates/banner.html:40 +msgid "DONATE NOW" +msgstr "" + +#: lego/templates/footer.html:13 lego/templates/footer.html:22 +#: lego/templates/navbar.html:84 templates/footer.html:13 +#: templates/footer.html:22 templates/navbar.html:84 +msgid "Download Tor Browser" +msgstr "" + +#: lego/templates/footer.html:14 templates/footer.html:14 +msgid "" +"Download Tor Browser to experience real private browsing without tracking, " +"surveillance, or censorship." +msgstr "" + +#: lego/templates/footer.html:35 templates/footer.html:35 +msgid "Our mission:" +msgstr "" + +#: lego/templates/footer.html:36 templates/footer.html:36 +msgid "" +"To advance human rights and freedoms by creating and deploying free and open " +"source anonymity and privacy technologies, supporting their unrestricted " +"availability and use, and furthering their scientific and popular " +"understanding." +msgstr "" + +#: lego/templates/footer.html:64 lego/templates/footer.html:66 +#: lego/templates/navbar.html:19 lego/templates/navbar.html:21 +#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:19 +#: templates/navbar.html:21 +msgid "Donate" +msgstr "" + +#: lego/templates/footer.html:75 templates/footer.html:75 +msgid "Subscribe to our Newsletter" +msgstr "" + +#: lego/templates/footer.html:76 templates/footer.html:76 +msgid "Get monthly updates and opportunities from the Tor Project:" +msgstr "" + +#: lego/templates/footer.html:77 templates/footer.html:77 +msgid "Sign up" +msgstr "" + +#: lego/templates/footer.html:98 templates/footer.html:98 +#, python-format +msgid "" +"Trademark, copyright notices, and rules for use by third parties can be " +"found in our %(link_to_faq)s" +msgstr "" + +#: lego/templates/navbar.html:26 templates/navbar.html:26 +msgid "Menu" +msgstr "" + +#: lego/templates/search.html:5 +msgid "Search" +msgstr "" + +#: lego/templates/secure-connections.html:1 +msgid "" +"The following visualization shows what information is visible to " +"eavesdroppers with and without Tor Browser and HTTPS encryption:" +msgstr "" + +#: lego/templates/secure-connections.html:4 +msgid "" +"Click the “Tor” button to see what data is visible to observers when you're " +"using Tor. The button will turn green to indicate that Tor is on." +msgstr "" + +#: lego/templates/secure-connections.html:5 +msgid "" +"Click the “HTTPS” button to see what data is visible to observers when " +"you're using HTTPS. The button will turn green to indicate that HTTPS is on." +msgstr "" + +#: lego/templates/secure-connections.html:6 +msgid "" +"When both buttons are green, you see the data that is visible to observers " +"when you are using both tools." +msgstr "" + +#: lego/templates/secure-connections.html:7 +msgid "" +"When both buttons are grey, you see the data that is visible to observers " +"when you don't use either tool." +msgstr "" + +#: lego/templates/secure-connections.html:11 +msgid "HTTPS" +msgstr "" + +#: lego/templates/secure-connections.html:15 +#: lego/templates/secure-connections.html:65 +msgid "Tor" +msgstr "" + +#: lego/templates/secure-connections.html:32 +msgid "POTENTIALLY VISIBLE DATA" +msgstr "" + +#: lego/templates/secure-connections.html:37 +msgid "Site.com" +msgstr "" + +#: lego/templates/secure-connections.html:40 +msgid "The site being visited." +msgstr "" + +#: lego/templates/secure-connections.html:44 +msgid "user / pw" +msgstr "" + +#: lego/templates/secure-connections.html:47 +msgid "Username and password used for authentication." +msgstr "" + +#: lego/templates/secure-connections.html:51 +msgid "data" +msgstr "" + +#: lego/templates/secure-connections.html:54 +msgid "Data being transmitted." +msgstr "" + +#: lego/templates/secure-connections.html:58 +msgid "location" +msgstr "" + +#: lego/templates/secure-connections.html:61 +msgid "" +"Network location of the computer used to visit the website (the public IP " +"address)." +msgstr "" + +#: lego/templates/secure-connections.html:68 +msgid "Whether or not Tor is being used." +msgstr "" + +#: templates/home.html:23 templates/project-page.html:23 +msgid "Research" +msgstr "" + +#: templates/home.html:25 templates/project-page.html:25 +msgid "" +"Many people around the world are doing research on how to improve the Tor " +"design, what's going on in the Tor network, and more generally on attacks " +"and defenses for anonymous communication systems. Our research portal holds " +"the resources we provide to help make your Tor research more effective." +msgstr "" + +#: templates/home.html:28 templates/project-page.html:28 +msgid "Research Portal" +msgstr "" + +#: templates/home.html:35 templates/project-page.html:35 +msgid "" +"Here you will find some projects that may be good ideas for Outreachy, " +"Google Summer of Code or other internship programs we may participate in in " +"future." +msgstr "" + +#: templates/home.html:38 templates/project-page.html:38 +msgid "Learn More" +msgstr "" + +#: templates/home.html:45 +msgid "Become a Tor Developer" +msgstr "" + +#: templates/home.html:47 +msgid "" +"Some guidelines here about how to join gitlab and a link to good first issue" +msgstr "" + +#: templates/home.html:49 templates/project.html:43 +msgid "Go to the link" +msgstr "" + +#: templates/meta.html:3 +msgid "" +"Defend yourself against tracking and surveillance. Circumvent censorship." +msgstr "" + +#: templates/meta.html:7 +msgid "Tor Project" +msgstr "" + +#: templates/project-ideas.html:22 +msgid "" +"None of these ideas seem appealing? You may also want to propose your own " +"project idea — which often results in the best projects." +msgstr "" + +#: templates/project-ideas.html:22 +msgid "We invite you to contact us to discuss your own project idea." +msgstr "" + +#: templates/project.html:40 +msgid "Join the conversation" +msgstr "" + +#: templates/project.html:42 +msgid "" +"Some guidelines here about how to join gitlab and a link to good first issue." +msgstr "" + +#: templates/project.html:50 templates/two-columns-page.html:27 +msgid "Contributors to this page:" +msgstr "" + +#: templates/project.html:52 templates/two-columns-page.html:29 +msgid "Back to previous page: " +msgstr "" + +#: templates/project.html:52 templates/two-columns-page.html:29 +msgid "Edit this page" +msgstr "" + +#: templates/team-page.html:12 +msgid "Projects" +msgstr "" + +#: templates/team-page.html:21 +msgid "Join our Mailing List" +msgstr "" + +#: templates/team-page.html:23 +msgid "Some Text." +msgstr "" + +#: templates/team-page.html:26 +msgid "Tor developers mailing list" +msgstr "" + +#: templates/training.html:27 +msgid "Join the Community" +msgstr "" + +#: templates/training.html:29 +msgid "" +"Are you interested in inviting someone from Tor to train your group? While " +"we receive a high volume of training requests and may not be able to offer " +"an in-person training, we may still be able to help. Contact the community " +"team and let's talk." +msgstr "" + +#: templates/training.html:32 +msgid "Community mailing list" +msgstr "" + +#: templates/macros/ideas.html:20 +msgid "Read more." +msgstr "" diff --git a/templates/banner.html b/templates/banner.html new file mode 120000 index 0000000..1202e0b --- /dev/null +++ b/templates/banner.html @@ -0,0 +1 @@ +../lego/templates/banner.html \ No newline at end of file diff --git a/templates/training.html b/templates/training.html new file mode 100644 index 0000000..39d6df0 --- /dev/null +++ b/templates/training.html @@ -0,0 +1,35 @@ +<div class="container py-5"> + <div class="row py-5"> + <div class="col-lg-7"> + {{ this.body }} + </div> + <div class="col-lg-5"> + <img src="/static/images/home/png/{{ this.section_id }}.png" class="img-fluid" alt="{{ _(this.section) }}" /> + </div> + </div> + <div class="row"> + {% for child in this.children|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> + </h4> + <p class="card-text">{{ _(child.subtitle) }}</p> + </div> + </div> + </div> + </div> + {% endfor %} + </div> + <div class="row py-5 text-center mx-auto"> + <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Join the Community') }}</h2> + <p class="text-center"> + {{ _('Are you interested in inviting someone from Tor to train your group? While we receive a high volume of training requests and may not be able to offer an in-person training, we may still be able to help. Contact the community team and let\'s talk.')}} + </p> + <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-community-team"> + {{ _('Community mailing list') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i> + </a> + </div> +</div>

1 0

[dev/staging] Change readme
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit c133a104e7f29a6cd7f010092b722ad970151413 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:09:23 2020 +0200 Change readme --- README.md | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/README.md b/README.md index 13720dc..2cdefa4 100644 --- a/README.md +++ b/README.md @@ -4,15 +4,15 @@ This is the repository of Dev portal. The current online version of this portal To clone the code use either of -```git clone https://git.torproject.org/project/web/community.git/``` +```git clone https://git.torproject.org/project/web/dev.git/``` -```torify git clone http://dccbbv6cooddgcrq.onion/project/web/community.git/``` +```torify git clone http://dccbbv6cooddgcrq.onion/project/web/dev.git/``` -or browse it [online](http://gitweb.torproject.org/project/web/community.git). +or browse it [online](http://gitweb.torproject.org/project/web/dev.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/dev/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. ## What is Lektor @@ -25,7 +25,7 @@ Its code can be found at [GitHub](https://github.com/lektor/lektor). ### (Easy) Edit this page button -You can click ```Edit this page``` and submit your content changes in a [Pull Request in GitHub](https://github.com/torproject/community/pulls). +You can click ```Edit this page``` and submit your content changes in a [Pull Request in GitHub](https://github.com/torproject/dev/pulls). ### (Advanced) Compiling a local version of the website @@ -35,7 +35,7 @@ You can click ```Edit this page``` and submit your content changes in a [Pull Re 3. Clone the repository: -```git clone https://git.torproject.org/project/web/community.git``` +```git clone https://git.torproject.org/project/web/dev.git``` 4. Init the building blocks submodule: @@ -51,7 +51,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/web/community/wikis/How-to-develop-on-the…. +Check our [wiki pages](https://dip.torproject.org/web/dev/wikis/How-to-develop-on-the-websi…. ### Translations @@ -68,12 +68,12 @@ If you want to contribute to the Community portal, we will be happy to help you. This is the workflow that Tor Internal people should use when making changes on the Community Portal: -1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/dev/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. 2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version… -3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/community/-/boards) +3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/dev/-/boards) 4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: - - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/community/develop/ - - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/community/blob/develop/content/onion-services/contents.lr` + - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/dev/develop/ + - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/dev/blob/develop/content/onion-services/contents.lr` - For the review workflow, please see (Reviewer Workflow) 5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… 6. Merger should then move the the ticket to the `Closed` column. @@ -89,16 +89,16 @@ This is the workflow that Tor Internal people should use when making changes on - Click on "Commit changes" 4. You will be sent to a new page to create your merge request: - Update "Title" with a short title to explain your changes - - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/community/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged + - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/dev/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. - Click "Submit merge request" -5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/community/merge_requests/2` +5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/dev/merge_requests/2` ### Volunteer Workflow This is the workflow that external volunteers should use when making changes on the Community Portal: -We recommend that you use our [github mirror](https://github.com/torproject/community) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: +We recommend that you use our [github mirror](https://github.com/torproject/dev) to submit PRs and contributions to our Community repo. Once you have a PR ready you should: 0. Ideally try to run it locally and check that nothing breaks and everything still behaves as before 1. Make a PR and ping the team on #tor-www IRC channel to let us know there's a PR waiting for review @@ -109,4 +109,4 @@ At this point, one of us on the website team will aim to review your PR within 2 - If there are any front end and/or template changes involved, the changes will be pushed to our `develop` branch for functionality review - If there are any fixes necessary, we will ask for changes to be made. -Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master. +Once it all looks good and behaves correctly, we will merge your request to the master branch of the dev portal [canonical repo](https://gitweb.torproject.org/project/web/dev.git/) on [gitweb](https://gitweb.torproject.org/) master.

1 0

[dev/staging] Change readme
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit 0e881621d232046a1aac6caebb1414a7c8471e8e Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:00:13 2020 +0200 Change readme --- README.md | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index b7dee2b..13720dc 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,18 @@ # Community portal -This is the repository of Community portal. The current online version of this portal can be found at https://community.torproject.org or [Community Onion Service](http://3gldbgtv5e4god56.onion/). +This is the repository of Dev portal. The current online version of this portal can be found at https://dev.torproject.org (currently in development). -To clone the code use either of +To clone the code use either of ```git clone https://git.torproject.org/project/web/community.git/``` -```torify git clone http://dccbbv6cooddgcrq.onion/project/web/community.git/``` +```torify git clone http://dccbbv6cooddgcrq.onion/project/web/community.git/``` or browse it [online](http://gitweb.torproject.org/project/web/community.git). -## How to report bugs or feedback +## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/community/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. ## What is Lektor @@ -37,7 +37,7 @@ You can click ```Edit this page``` and submit your content changes in a [Pull Re ```git clone https://git.torproject.org/project/web/community.git``` -4. Init the building blocks submodule: +4. Init the building blocks submodule: ```$ cd lego && git submodule update --init --recursive``` @@ -109,5 +109,4 @@ At this point, one of us on the website team will aim to review your PR within 2 - If there are any front end and/or template changes involved, the changes will be pushed to our `develop` branch for functionality review - If there are any fixes necessary, we will ask for changes to be made. -Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master. - +Once it all looks good and behaves correctly, we will merge your request to the master branch of the community portal [canonical repo](https://gitweb.torproject.org/project/web/community.git/) on [gitweb](https://gitweb.torproject.org/) master.

1 0

[dev/staging] Change readme
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit 5f34de046b50eed673701041d3e86bd645736852 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:41:50 2020 +0200 Change readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 2cdefa4..9271f35 100644 --- a/README.md +++ b/README.md @@ -12,7 +12,7 @@ or browse it [online](http://gitweb.torproject.org/project/web/dev.git). ## How to report bugs or feedback -First check if your issue wasn't already opened in [dip.torproject.org](https://dip.torproject.org/web/dev/issues), then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) and choose the component: Webpages/Community. +Check if your issue wasn't already opened in [gitlab.torproject.org](https://gitlab.torproject.org/web/dev/issues) then open a new bug. ## What is Lektor

1 0

[dev/staging] Update lego
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit f8f7bca48b101a01bf9c68a6dbc05ac77f6508fe Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 11:52:43 2020 +0200 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 7f2289b..7bb98ba 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3 +Subproject commit 7bb98ba753539250d3346ad559f0279b76dfb0fb

1 0

[dev/staging] Update lego
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit 52750f9482b091934b3e19207347c921efa2f8c8 Author: hiro <hiro(a)torproject.org> Date: Fri May 15 14:52:41 2020 +0200 Update lego --- databags/menu+bn-BD.ini | 1 - databags/menu+de.ini | 1 - databags/menu+en.ini | 1 - databags/menu+es.ini | 1 - databags/menu+fr.ini | 1 - databags/menu+id.ini | 1 - databags/menu+is.ini | 1 - databags/menu+it.ini | 1 - databags/menu+ka.ini | 1 - databags/menu+ko.ini | 1 - databags/menu+pt-BR.ini | 1 - databags/menu+ru.ini | 1 - databags/menu+tr.ini | 1 - databags/menu+zh-CN.ini | 1 - databags/menu_footer+bn-BD.ini | 1 - databags/menu_footer+de.ini | 1 - databags/menu_footer+en.ini | 1 - databags/menu_footer+es.ini | 1 - databags/menu_footer+fr.ini | 1 - databags/menu_footer+id.ini | 1 - databags/menu_footer+is.ini | 1 - databags/menu_footer+it.ini | 1 - databags/menu_footer+ka.ini | 1 - databags/menu_footer+ko.ini | 1 - databags/menu_footer+pt-BR.ini | 1 - databags/menu_footer+ru.ini | 1 - databags/menu_footer+tr.ini | 1 - databags/menu_footer+zh-CN.ini | 1 - databags/pagenav+de.ini | 1 - databags/pagenav+es.ini | 1 - databags/pagenav+fr.ini | 1 - databags/pagenav+it.ini | 1 - databags/pagenav+pt-BR.ini | 1 - databags/pagenav+ru.ini | 1 - lego | 2 +- 35 files changed, 1 insertion(+), 35 deletions(-) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini deleted file mode 120000 index c9b2dc8..0000000 --- a/databags/menu+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+bn-BD.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini deleted file mode 120000 index 6bb02de..0000000 --- a/databags/menu+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+de.ini \ No newline at end of file diff --git a/databags/menu+en.ini b/databags/menu+en.ini deleted file mode 120000 index 1fa7edf..0000000 --- a/databags/menu+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 120000 index fd8def3..0000000 --- a/databags/menu+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+es.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini deleted file mode 120000 index 5366289..0000000 --- a/databags/menu+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+fr.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini deleted file mode 120000 index 7c2858b..0000000 --- a/databags/menu+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+id.ini \ No newline at end of file diff --git a/databags/menu+is.ini b/databags/menu+is.ini deleted file mode 120000 index b02aed7..0000000 --- a/databags/menu+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+is.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini deleted file mode 120000 index fcdde73..0000000 --- a/databags/menu+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+it.ini \ No newline at end of file diff --git a/databags/menu+ka.ini b/databags/menu+ka.ini deleted file mode 120000 index 336d4ad..0000000 --- a/databags/menu+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ka.ini \ No newline at end of file diff --git a/databags/menu+ko.ini b/databags/menu+ko.ini deleted file mode 120000 index 31e262b..0000000 --- a/databags/menu+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ko.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini deleted file mode 120000 index fd27afb..0000000 --- a/databags/menu+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+pt-BR.ini \ No newline at end of file diff --git a/databags/menu+ru.ini b/databags/menu+ru.ini deleted file mode 120000 index 6f30a3e..0000000 --- a/databags/menu+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+ru.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini deleted file mode 120000 index 8a01592..0000000 --- a/databags/menu+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+tr.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini deleted file mode 120000 index 425a6f8..0000000 --- a/databags/menu+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu+zh-CN.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini deleted file mode 120000 index 5dd8aed..0000000 --- a/databags/menu_footer+bn-BD.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+bn-BD.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini deleted file mode 120000 index 851da53..0000000 --- a/databags/menu_footer+de.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+de.ini \ No newline at end of file diff --git a/databags/menu_footer+en.ini b/databags/menu_footer+en.ini deleted file mode 120000 index d14a20f..0000000 --- a/databags/menu_footer+en.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini deleted file mode 120000 index c52cdcb..0000000 --- a/databags/menu_footer+es.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+es.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini deleted file mode 120000 index 7ce02c3..0000000 --- a/databags/menu_footer+fr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+fr.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini deleted file mode 120000 index 056defd..0000000 --- a/databags/menu_footer+id.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+id.ini \ No newline at end of file diff --git a/databags/menu_footer+is.ini b/databags/menu_footer+is.ini deleted file mode 120000 index 2474621..0000000 --- a/databags/menu_footer+is.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+is.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini deleted file mode 120000 index 8225a53..0000000 --- a/databags/menu_footer+it.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+it.ini \ No newline at end of file diff --git a/databags/menu_footer+ka.ini b/databags/menu_footer+ka.ini deleted file mode 120000 index fd41467..0000000 --- a/databags/menu_footer+ka.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ka.ini \ No newline at end of file diff --git a/databags/menu_footer+ko.ini b/databags/menu_footer+ko.ini deleted file mode 120000 index 6ff3bf2..0000000 --- a/databags/menu_footer+ko.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ko.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini deleted file mode 120000 index 5198e0f..0000000 --- a/databags/menu_footer+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+pt-BR.ini \ No newline at end of file diff --git a/databags/menu_footer+ru.ini b/databags/menu_footer+ru.ini deleted file mode 120000 index ad782bc..0000000 --- a/databags/menu_footer+ru.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+ru.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini deleted file mode 120000 index 2c88858..0000000 --- a/databags/menu_footer+tr.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+tr.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini deleted file mode 120000 index 0fd8366..0000000 --- a/databags/menu_footer+zh-CN.ini +++ /dev/null @@ -1 +0,0 @@ -../lego/databags/menu_footer+zh-CN.ini \ No newline at end of file diff --git a/databags/pagenav+de.ini b/databags/pagenav+de.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+de.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+es.ini b/databags/pagenav+es.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+es.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+fr.ini b/databags/pagenav+fr.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+fr.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+it.ini b/databags/pagenav+it.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+it.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+pt-BR.ini b/databags/pagenav+pt-BR.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+pt-BR.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/databags/pagenav+ru.ini b/databags/pagenav+ru.ini deleted file mode 120000 index 214e4d8..0000000 --- a/databags/pagenav+ru.ini +++ /dev/null @@ -1 +0,0 @@ -pagenav+en.ini \ No newline at end of file diff --git a/lego b/lego index abbf18c..7f2289b 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit abbf18cb1bbca70caeb8913d2b60f0cb9332f287 +Subproject commit 7f2289bf68685da40878bb09ee91346057c443d3

1 0

[dev/staging] Change readme
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit d0a666e607c46b6c3c78e027328638ae3c87ae42 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:48:30 2020 +0200 Change readme --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 0c7dc37..a3bf30e 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # Community portal -This is the repository of Dev portal. +This is the repository of Dev portal. To clone the code use either of @@ -51,7 +51,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/web/dev/wikis/How-to-develop-on-the-websi…. +Check our [wiki pages](https://dip.torproject.org/tpo/web/dev/wikis/How-to-develop-on-the-w…. ### Translations

1 0

[dev/staging] Change readme
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit 3cdac36c569fc93a1ddd841ebb7f99b945fd6819 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 15:12:06 2020 +0200 Change readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8f3c66b..35f6c38 100644 --- a/README.md +++ b/README.md @@ -71,7 +71,7 @@ This is the workflow that Tor Internal people should use when making changes on 1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://gitlab.torproject.org/web/dev/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. 2. To view your changes on the website, you can [run lektor locally](https://gitlab.torproject.org/web/tpo/wikis/Compiling-a-local-vers… 3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://gitlab.torproject.org/web/dev/-/boards) -4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: +4. Add a comment to the issue, tagging the reviewer, e.g `@hiro`, with: - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/dev/develop/ - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://gitlab.torproject.org/steph/dev/blob/develop/content/onion-services/contents.lr` - For the review workflow, please see (Reviewer Workflow)

1 0

[dev/staging] Change readme
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit af6c6ecb45ccfe23208a08d889a7d52114038292 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 15:11:23 2020 +0200 Change readme --- README.md | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index 972ba0c..8f3c66b 100644 --- a/README.md +++ b/README.md @@ -68,14 +68,14 @@ If you want to contribute to the Community portal, we will be happy to help you. This is the workflow that Tor Internal people should use when making changes on the Community Portal: -1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://dip.torproject.org/web/dev/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. -2. To view your changes on the website, you can [run lektor locally](https://dip.torproject.org/web/tpo/wikis/Compiling-a-local-version… -3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://dip.torproject.org/web/dev/-/boards) +1. When starting work on an issue or content, please assign the issue to yourself and move into the `Doing` column on the [Community Portal Project Board](https://gitlab.torproject.org/web/dev/-/boards). You can follow the process outlined in ["How to send a merge request or propose a change"](https://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#how-to-send-a-merge-request-or-propose-a-change) to work on your changes. +2. To view your changes on the website, you can [run lektor locally](https://gitlab.torproject.org/web/tpo/wikis/Compiling-a-local-vers… +3. Once you are happy with your work, push your changes to `develop` branch and move to `needs-review` column on the [Community Portal Project Board](https://gitlab.torproject.org/web/dev/-/boards) 4. Add a comment to the issue, tagging the reviewer, e.g `@steph`, with: - Location of page on lektor-staging `develop` branch, e.g https://lektor-staging.torproject.org/dev/develop/ - - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://dip.torproject.org/steph/dev/blob/develop/content/onion-services/contents.lr` + - Contents file, containing your changes where it would be located on the **reviewer's repo** e.g `https://gitlab.torproject.org/steph/dev/blob/develop/content/onion-services/contents.lr` - For the review workflow, please see (Reviewer Workflow) -5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://dip.torproject.org/web/tpo/wikis/Git-flow-and-merge-requests#… +5. Once the work has been reviewed and any necessary changes and merge request has been made, a repo maintainer or team members with write access to gitweb master will then merge or cherry-pick these changes to master, following the workflow outlined in [How to use our git flow](https://gitlab.torproject.org/web/tpo/wikis/Git-flow-and-merge-reques… 6. Merger should then move the the ticket to the `Closed` column. ### Reviewer Workflow @@ -89,10 +89,10 @@ This is the workflow that Tor Internal people should use when making changes on - Click on "Commit changes" 4. You will be sent to a new page to create your merge request: - Update "Title" with a short title to explain your changes - - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://dip.torproject.org/web/dev/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged + - Update "Description", you can use the commit message you entered before additionally referencing the original issue you have reviewed, e.g `https://gitlab.torproject.org/web/dev/issues/3` and tagging one of the repo maintainers e.g `@pili` so they know the change can be merged - Make sure that both "Delete source branch when merge request is accepted" and "Squash commits when merge request is accepted" are checked. - Click "Submit merge request" -5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://dip.torproject.org/steph/dev/merge_requests/2` +5. Reviewer should comment on the original issue with a link to the merge request created, e.g `https://gitlab.torproject.org/steph/dev/merge_requests/2` ### Volunteer Workflow

1 0

[dev/staging] Change readme
by hiro＠torproject.org 24 Nov '20

24 Nov '20

commit f8716df34e81dd1839959fea1691911f1744f7e9 Author: hiro <hiro(a)torproject.org> Date: Wed Jul 8 12:53:53 2020 +0200 Change readme --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index a3bf30e..972ba0c 100644 --- a/README.md +++ b/README.md @@ -51,7 +51,7 @@ To just build the website once: ```$ lektor build -O <folder>``` #### How to develop on the website -Check our [wiki pages](https://dip.torproject.org/tpo/web/dev/wikis/How-to-develop-on-the-w…. +Check our [wiki pages](https://gitlab.torproject.org/tpo/web/dev/wikis/How-to-develop-on-th…. ### Translations

1 0