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

[tpo/master] prepare strings for localization
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 99ce17e3fb6a358441177b0233a2b2c2b2381710 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 7 13:28:39 2019 +0100 prepare strings for localization --- content/about/history/contents.lr | 13 +++++++++---- templates/thank-you.html | 6 +++--- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index 37165dd..cf1ec25 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -22,19 +22,24 @@ The goal of onion routing was to have a way to use the internet with as much pri In the early 2000s, Roger Dingledine, a recent [Massachusetts Institute of Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL onion routing project with Paul Syverson. To distinguish this original work at NRL from other onion routing efforts that were starting to pop up elsewhere, Roger called the project Tor, which stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, joined the project soon after. -From its inception in the 1990s, onion routing was conceived to rely on a decentralized network. The network needed to be operated by entities with diverse interests and trust assumptions, and the software needed to be free and open to maximize transparency and separation. That’s why in October 2002 when the Tor network was initially deployed, its code was released under a free and open software license. By the end of 2003, the network had about a dozen volunteer nodes, mostly in the U.S., plus one in Germany. +From its inception in the 1990s, onion routing was conceived to rely on a decentralized network. The network needed to be operated by entities with diverse interests and trust assumptions, and the software needed to be free and open to maximize transparency and separation. +That’s why in October 2002 when the Tor network was initially deployed, its code was released under a free and open software license. +By the end of 2003, the network had about a dozen volunteer nodes, mostly in the U.S., plus one in Germany. Recognizing the benefit of Tor to digital rights, the [Electronic Frontier Foundation (EFF)](https://www.eff.org/) began funding Roger's and Nick's work on Tor in 2004. In 2006, the Tor Project, Inc., a 501(c)3 nonprofit organization, was founded to maintain Tor’s development. In 2007, the organization began developing bridges to the Tor network to address censorship, such as the need to get around government firewalls, in order for its users to access the open web. -Tor began gaining popularity among activists and tech-savvy users interested in privacy, but it was still difficult for less-technically savvy people to use, so starting in 2005, development of tools beyond just the Tor proxy began. Development of Tor Browser began in [2008](https://lists.torproject.org/pipermail/tor-talk/2008-January/007837.h…. +Tor began gaining popularity among activists and tech-savvy users interested in privacy, but it was still difficult for less-technically savvy people to use, so starting in 2005, development of tools beyond just the Tor proxy began. +Development of Tor Browser began in [2008](https://lists.torproject.org/pipermail/tor-talk/2008-January/007837.h…. With Tor Browser having made Tor more accessible to everyday internet users and activists, Tor was an instrumental tool during the [Arab Spring](https://www.theguardian.com/us-news/the-nsa-files) beginning in late 2010. It not only protected people’s identity online but also allowed them to access critical resources, social media, and websites which were blocked. -The need for tools safeguarding against mass surveillance became a mainstream concern thanks to the [Snowden revelations in 2013](https://www.theguardian.com/us-news/the-nsa-files). Not only was Tor instrumental to Snowden’s whistleblowing, but content of the documents also upheld assurances that, at that time, [Tor could not be cracked](https://www.wired.com/story/the-grand-tor/). +The need for tools safeguarding against mass surveillance became a mainstream concern thanks to the [Snowden revelations in 2013](https://www.theguardian.com/us-news/the-nsa-files). +Not only was Tor instrumental to Snowden’s whistleblowing, but content of the documents also upheld assurances that, at that time, [Tor could not be cracked](https://www.wired.com/story/the-grand-tor/). -People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. Today, the network has [thousands of relays](http://metrics.torproject.org) run by volunteers and millions of users worldwide. And it is this diversity that keeps Tor users safe. +People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. +Today, the network has [thousands of relays](http://metrics.torproject.org) run by volunteers and millions of users worldwide. And it is this diversity that keeps Tor users safe. We at the Tor Project fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online. diff --git a/templates/thank-you.html b/templates/thank-you.html index 745cc2b..9f14d53 100644 --- a/templates/thank-you.html +++ b/templates/thank-you.html @@ -10,15 +10,15 @@ <div class="row"> <div class="col-md-4"> <i class="fas fa-paper-plane text-primary pr-2"></i> - <h4><a href="https://newsletter.torproject.org">{{ _('Sign up') }}</a>{{ _(' for Tor News and get updates and opportunities from across the organization and community.') }}</h4> + <h4><a href="https://newsletter.torproject.org">{{ _('Sign up for Tor News and get updates and opportunities from across the organization and community.') }}</a></h4> </div> <div class="col-md-4"> <i class="fas fa-cube text-primary pr-2"></i> - <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay') }}</a>{{ _(' to make the network faster and more decentralized.') }}</h4> + <h4><a href="https://trac.torproject.org/projects/tor/wiki/TorRelayGuide">{{ _('Run a relay to make the network faster and more decentralized.') }}</a></h4> </div> <div class="col-md-4"> <i class="fas fa-hands-helping text-primary pr-2"></i> - <h4>{{ _('Use your skills to') }}<a href="https://torproject.org/volunteer">{{ _(' volunteer.') }}</a></h4> + <h4><a href="https://torproject.org/volunteer">{{ _('Use your skills to volunteer.') }}</a></h4> </div> </div> </div>

1 0

[tpo/master] replace http with https link
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 43fbd9cd69cf5459097eafd76d47c4c3ce61b8ad Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 9 10:59:49 2019 +0100 replace http with https link --- content/about/history/contents.lr | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index 3b357eb..d88836c 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -42,7 +42,7 @@ The need for tools safeguarding against mass surveillance became a mainstream co Not only was Tor instrumental to Snowden’s whistleblowing, but content of the documents also upheld assurances that, at that time, [Tor could not be cracked](https://www.wired.com/story/the-grand-tor/). People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. -Today, the network has [thousands of relays](http://metrics.torproject.org) run by volunteers and millions of users worldwide. And it is this diversity that keeps Tor users safe. +Today, the network has [thousands of relays](https://metrics.torproject.org) run by volunteers and millions of users worldwide. And it is this diversity that keeps Tor users safe. We, at the Tor Project, fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online.

1 0

[tpo/master] Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit c3597fcb5da9080513f98090ad98aee327864a80 Merge: 99ce17e 9397a07 Author: emma peel <emma.peel(a)riseup.net> Date: Thu Mar 7 13:28:53 2019 +0100 Merge branch 'staging' of https://git.torproject.org/project/web/tpo into staging templates/download.html | 11 +++++++---- templates/macros/people.html | 4 ++-- templates/sponsors.html | 3 ++- 3 files changed, 11 insertions(+), 7 deletions(-)

1 0

[tpo/master] translate link labels on navbar and footer
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 83252fd4c04bfcd26c93990ed7e6e2c03f563e64 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Mar 11 05:57:58 2019 +0100 translate link labels on navbar and footer --- templates/footer.html | 6 +++--- templates/navbar.html | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/footer.html b/templates/footer.html index 3235767..1648b27 100644 --- a/templates/footer.html +++ b/templates/footer.html @@ -33,7 +33,7 @@ {% else %} <a class="nav-link text-light" href="{{ item.path }}"> {% endif %} - {{ item.label }} + {{ _(item.label) }} {% if this.is_child_of(item.path) %} <span class="sr-only">(current)</span> {% endif %} @@ -46,8 +46,8 @@ <div class="col-12 d-flex justify-content-center"> <div class="col-md-8 mt-5 pb-5 border"> <p class="text-primary-light text-uppercase">{{ _('Subscribe to our Newsletter') }}</p> - <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project') }}:</p> - <p class="w"><a class="btn btn-small btn-dark mt-2 text-white text-uppercase active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/">Sign up</a></p> + <p class="text-light">{{ _('Get monthly updates and opportunities from the Tor Project:') }}</p> + <p class="w"><a class="btn btn-small btn-dark mt-2 text-white text-uppercase active" role="button" aria-pressed="true" href="https://newsletter.torproject.org/">{{ _('Sign up') }}</a></p> </div> </div> diff --git a/templates/navbar.html b/templates/navbar.html index a7466fb..1b7f712 100644 --- a/templates/navbar.html +++ b/templates/navbar.html @@ -27,7 +27,7 @@ {% else %} <a class="nav-link" href="{{ item.path }}"> {% endif %} - {{ item.label }} + {{ _(item.label) }} {% if this.path == item.path %} <span class="sr-only">(current)</span> {% endif %}

1 0

[tpo/master] translators source corrections, thanks Ao!
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 4d7f26f206f3c08bba3075ebbd4da6165d10c161 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 9 10:59:19 2019 +0100 translators source corrections, thanks Ao! --- content/about/history/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index 9589d67..3b357eb 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -44,6 +44,6 @@ Not only was Tor instrumental to Snowden’s whistleblowing, but content of the People’s awareness of tracking, surveillance, and censorship may have increased, but so has the prevalence of these hindrances to internet freedom. Today, the network has [thousands of relays](http://metrics.torproject.org) run by volunteers and millions of users worldwide. And it is this diversity that keeps Tor users safe. -We at the Tor Project fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online. +We, at the Tor Project, fight every day for everyone to have private access to an uncensored internet, and Tor has become the world’s strongest tool for privacy and freedom online. But Tor is more than just software. It is a labor of love produced by an international community of people devoted to human rights. The Tor Project is [deeply committed](https://blog.torproject.org/tor-social-contract) to transparency and the safety of its users. diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index 34aa8d6..b09ecdf 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/content/about/sponsors/mozilla/contents.lr @@ -14,4 +14,5 @@ link: https://www.mozilla.org/en-US/moss/ --- description: -Mozilla’s mission is to ensure the Internet is a global public resource, open and accessible to all. Several grants from Mozilla , including the Mozilla Open Source Support (MOSS) awards program, helped with the following projects: maintaining TorBirdy, a plugin to connect your email client Thunderbird with Tor; modularization of Tor network codebase making it more accessible, faster, and easier to adopt; significant improvements to OONI Explorer; Open Web Fellowship; Glass Room exhibit; and Mozilla’s year-end matching funds that help all of Tor’s important work. +Mozilla’s mission is to ensure the Internet is a global public resource, open and accessible to all. +Several grants from Mozilla, including the Mozilla Open Source Support (MOSS) awards program, helped with the following projects: maintaining TorBirdy, a plugin to connect your email client Thunderbird with Tor; modularization of Tor network codebase making it more accessible, faster, and easier to adopt; significant improvements to OONI Explorer; Open Web Fellowship; Glass Room exhibit; and Mozilla’s year-end matching funds that help all of Tor’s important work.

1 0

[tpo/master] better strings for l10n
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 6db62df1ae34bed062a8073e6e319fe95d515001 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 9 05:52:02 2019 +0100 better strings for l10n --- content/about/contents.lr | 4 ++-- content/about/history/contents.lr | 11 +++++++---- content/about/jobs/contents.lr | 2 +- content/about/people/contents.lr | 2 +- content/about/reports/contents.lr | 2 +- content/about/sponsors/contents.lr | 2 +- content/contact/contents.lr | 4 ++-- content/download/contents.lr | 4 ++-- content/download/languages/contents.lr | 2 +- content/download/options/contents.lr | 2 +- content/press/contents.lr | 4 ++-- content/thank-you/contents.lr | 9 ++++++--- 12 files changed, 27 insertions(+), 21 deletions(-) diff --git a/content/about/contents.lr b/content/about/contents.lr index 36890a7..a9cbf7c 100644 --- a/content/about/contents.lr +++ b/content/about/contents.lr @@ -1,12 +1,12 @@ _template: about.html --- -section: about +section: About --- section_id: about --- color: primary --- -title: history +title: History --- body: diff --git a/content/about/history/contents.lr b/content/about/history/contents.lr index cf1ec25..9589d67 100644 --- a/content/about/history/contents.lr +++ b/content/about/history/contents.lr @@ -1,6 +1,6 @@ _template: about.html --- -section: about +section: About --- section_id: about --- @@ -16,11 +16,14 @@ The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of “oni **Just like Tor users, the developers, researchers, and funders who’ve made Tor possible are a diverse group of people. But all of the people who have been involved in Tor are united by a common belief: internet users should have private access to an uncensored web.** -In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1995, David Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab (NRL), asked themselves if there was a way to create internet connections that don’t reveal who is talking to whom, even to someone monitoring the network. Their answer was to create and deploy the first research designs and prototypes of onion routing. +In the 1990s, the lack of security on the internet and its ability to be used for tracking and surveillance was becoming clear, and in 1995, David Goldschlag, Mike Reed, and Paul Syverson at the U.S. Naval Research Lab (NRL) asked themselves if there was a way to create internet connections that don’t reveal who is talking to whom, even to someone monitoring the network. +Their answer was to create and deploy the first research designs and prototypes of onion routing. -The goal of onion routing was to have a way to use the internet with as much privacy as possible, and the idea was to route traffic through multiple servers and encrypt it each step of the way. This is still a simple explanation for how Tor works today. +The goal of onion routing was to have a way to use the internet with as much privacy as possible, and the idea was to route traffic through multiple servers and encrypt it each step of the way. +This is still a simple explanation for how Tor works today. -In the early 2000s, Roger Dingledine, a recent [Massachusetts Institute of Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL onion routing project with Paul Syverson. To distinguish this original work at NRL from other onion routing efforts that were starting to pop up elsewhere, Roger called the project Tor, which stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, joined the project soon after. +In the early 2000s, Roger Dingledine, a recent [Massachusetts Institute of Technology (MIT)](https://web.mit.edu/) graduate, began working on an NRL onion routing project with Paul Syverson. +To distinguish this original work at NRL from other onion routing efforts that were starting to pop up elsewhere, Roger called the project Tor, which stood for The Onion Routing. Nick Mathewson, a classmate of Roger's at MIT, joined the project soon after. From its inception in the 1990s, onion routing was conceived to rely on a decentralized network. The network needed to be operated by entities with diverse interests and trust assumptions, and the software needed to be free and open to maximize transparency and separation. That’s why in October 2002 when the Tor network was initially deployed, its code was released under a free and open software license. diff --git a/content/about/jobs/contents.lr b/content/about/jobs/contents.lr index 38c41cb..7114a31 100644 --- a/content/about/jobs/contents.lr +++ b/content/about/jobs/contents.lr @@ -2,7 +2,7 @@ _model: jobs --- _template: about.html --- -section: about +section: About --- section_id: about --- diff --git a/content/about/people/contents.lr b/content/about/people/contents.lr index d9928f9..58d00f2 100644 --- a/content/about/people/contents.lr +++ b/content/about/people/contents.lr @@ -2,7 +2,7 @@ _model: people --- _template: about.html --- -section: about +section: About --- section_id: about --- diff --git a/content/about/reports/contents.lr b/content/about/reports/contents.lr index cc6e037..168dfdb 100644 --- a/content/about/reports/contents.lr +++ b/content/about/reports/contents.lr @@ -1,6 +1,6 @@ _template: about.html --- -section: about +section: About --- section_id: about --- diff --git a/content/about/sponsors/contents.lr b/content/about/sponsors/contents.lr index 4966d19..10993ed 100644 --- a/content/about/sponsors/contents.lr +++ b/content/about/sponsors/contents.lr @@ -2,7 +2,7 @@ _model: sponsors --- _template: about.html --- -section: about +section: About --- section_id: about --- diff --git a/content/contact/contents.lr b/content/contact/contents.lr index 40b9589..5cb4b15 100644 --- a/content/contact/contents.lr +++ b/content/contact/contents.lr @@ -1,6 +1,6 @@ _template: layout.html --- -section: the tor project +section: The Tor Project --- section_id: the_tor_project --- @@ -8,7 +8,7 @@ html: contact.html --- color: primary --- -title: contact +title: Contact --- body: diff --git a/content/download/contents.lr b/content/download/contents.lr index de8f01f..79b9136 100644 --- a/content/download/contents.lr +++ b/content/download/contents.lr @@ -1,6 +1,6 @@ _template: jumbotron.html --- -section: download +section: Download --- section_id: download --- @@ -8,6 +8,6 @@ html: download.html --- color: dark --- -title: download +title: Download --- body: diff --git a/content/download/languages/contents.lr b/content/download/languages/contents.lr index d55af50..6004c91 100644 --- a/content/download/languages/contents.lr +++ b/content/download/languages/contents.lr @@ -1,6 +1,6 @@ _template: jumbotron.html --- -section: download +section: Download --- section_id: download --- diff --git a/content/download/options/contents.lr b/content/download/options/contents.lr index eff395d..7f490e2 100644 --- a/content/download/options/contents.lr +++ b/content/download/options/contents.lr @@ -1,6 +1,6 @@ _template: jumbotron.html --- -section: download +section: Download --- section_id: download --- diff --git a/content/press/contents.lr b/content/press/contents.lr index e304e09..e47ec8b 100644 --- a/content/press/contents.lr +++ b/content/press/contents.lr @@ -2,7 +2,7 @@ _template: layout.html --- _model: press --- -section: the tor project +section: The Tor Project --- section_id: the_tor_project --- @@ -10,7 +10,7 @@ html: press.html --- color: primary --- -title: press +title: Press --- body: diff --git a/content/thank-you/contents.lr b/content/thank-you/contents.lr index 9a2f869..3ba1f1e 100644 --- a/content/thank-you/contents.lr +++ b/content/thank-you/contents.lr @@ -1,6 +1,6 @@ _template: layout.html --- -section: the tor project +section: The Tor Project --- section_id: the_tor_project --- @@ -8,8 +8,11 @@ html: thank-you.html --- color: primary --- -title: success +title: Success --- body: -You’re equipped to browse freely. Tor is the strongest tool for privacy and freedom online. It is free and open source software maintained by the Tor Project and a community of volunteers worldwide. We need your help to keep Tor secure and safe for millions across the globe. [Donate Now](https://donate.torproject.org/) +You’re equipped to browse freely. +Tor is the strongest tool for privacy and freedom online. +It is free and open source software maintained by the Tor Project and a community of volunteers worldwide. +We need your help to keep Tor secure and safe for millions across the globe. [Donate Now](https://donate.torproject.org/)

1 0

[tpo/master] add more langs
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit dbb09861e8ed038f102c8bae0a074b13d12e9e3e Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 9 09:03:28 2019 +0100 add more langs --- configs/i18n.ini | 2 +- databags/about+bn-BD.ini | 1 + databags/about+de.ini | 1 + databags/about+es.ini | 20 +---------------- databags/about+fr.ini | 20 +---------------- databags/about+id.ini | 1 + databags/about+it.ini | 1 + databags/about+pt-BR.ini | 1 + databags/about+tr.ini | 1 + databags/about+zh-CN.ini | 1 + databags/alternatives.ini | 42 ++++++++++++++++++++++++++++++++--- databags/download-alternatives.ini | 32 +++++++++++++++++++++++++-- databags/menu+bn-BD.ini | 1 + databags/menu+de.ini | 1 + databags/menu+es.ini | 20 +---------------- databags/menu+fr.ini | 20 +---------------- databags/menu+id.ini | 1 + databags/menu+it.ini | 1 + databags/menu+pt-BR.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+es.ini | 16 +------------- databags/menu_footer+fr.ini | 16 +------------- databags/menu_footer+id.ini | 1 + databags/menu_footer+it.ini | 1 + databags/menu_footer+pt-BR.ini | 1 + databags/menu_footer+tr.ini | 1 + databags/menu_footer+zh-CN.ini | 1 + tpo.lektorproject | 45 +++++++++++++++++++++++++++++++++----- 31 files changed, 137 insertions(+), 117 deletions(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index d65d25e..4665823 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -1,5 +1,5 @@ content = en -translations = es,fr +translations = bn-BD,de,es,fr,id,it,pt-BR,tr,zh-CN i18npath = i18n translate_paragraphwise = False url_prefix = https://torproject.org/ diff --git a/databags/about+bn-BD.ini b/databags/about+bn-BD.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+bn-BD.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+de.ini b/databags/about+de.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+de.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+es.ini b/databags/about+es.ini deleted file mode 100644 index 43f44fd..0000000 --- a/databags/about+es.ini +++ /dev/null @@ -1,19 +0,0 @@ -[history] -path = about/history -label = History - -[people] -path = about/people -label = People - -[sponsors] -path = about/sponsors -label = Sponsors - -[reports] -path = about/reports -label = Reports - -[jobs] -path = about/jobs -label = Jobs diff --git a/databags/about+es.ini b/databags/about+es.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+es.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+fr.ini b/databags/about+fr.ini deleted file mode 100644 index 43f44fd..0000000 --- a/databags/about+fr.ini +++ /dev/null @@ -1,19 +0,0 @@ -[history] -path = about/history -label = History - -[people] -path = about/people -label = People - -[sponsors] -path = about/sponsors -label = Sponsors - -[reports] -path = about/reports -label = Reports - -[jobs] -path = about/jobs -label = Jobs diff --git a/databags/about+fr.ini b/databags/about+fr.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+fr.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+id.ini b/databags/about+id.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+id.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+it.ini b/databags/about+it.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+it.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+pt-BR.ini b/databags/about+pt-BR.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+pt-BR.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+tr.ini b/databags/about+tr.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+tr.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/about+zh-CN.ini b/databags/about+zh-CN.ini new file mode 120000 index 0000000..234b948 --- /dev/null +++ b/databags/about+zh-CN.ini @@ -0,0 +1 @@ +about+en.ini \ No newline at end of file diff --git a/databags/alternatives.ini b/databags/alternatives.ini index d355706..3cbde89 100644 --- a/databags/alternatives.ini +++ b/databags/alternatives.ini @@ -4,11 +4,17 @@ order = order-last url = / language = English (en) -[en-US] +[bn-BD] direction = text-left order = order-last -url = /en-US/ -language = English (en) +url = /bn-BD/ +language = বাংলা ভাষা (bn-BD) + +[de] +direction = text-left +order = order-last +url = /de/ +language = Deutsch (de) [es] direction = text-left @@ -21,3 +27,33 @@ direction = text-left order = order-last url = /fr/ language = Français (fr) + +[id] +direction = text-left +order = order-last +url = /id/ +language = Indonesia (id) + +[it] +direction = text-left +order = order-last +url = /it/ +language = Italiano (it) + +[pt-BR] +direction = text-left +order = order-last +url = /pt-BR/ +language = Português Brasil (pt-BR) + +[tr] +direction = text-left +order = order-last +url = /tr/ +language = Türkçe (tr) + +[zh-CN] +direction = text-left +order = order-last +url = /zh-CN/ +language = 简体字 (zh-CN) diff --git a/databags/download-alternatives.ini b/databags/download-alternatives.ini index a7cb5d9..0a9e941 100644 --- a/databags/download-alternatives.ini +++ b/databags/download-alternatives.ini @@ -1,7 +1,15 @@ -[en-US] -url = /en-US/ +[en] +url = /en/ language = English (en) +[bn-BD] +url = /bn-BD/ +language = বাংলা ভাষা (bn) + +[de] +url = /de/ +language = Deutsch (de) + [es] url = /es/ language = Español (es) @@ -9,3 +17,23 @@ language = Español (es) [fr] url = /fr/ language = Français (fr) + +[id] +url = /id/ +language = Indonesia (id) + +[it] +url = /it/ +language = Italiano (it) + +[pt-BR] +url = /pt-BR/ +language = Português Brasil(pt-BR) + +[tr] +url = /tr/ +language = Türkçe (tr) + +[zh-CN] +url = /zh-CN/ +language = 中文简 (zh-CN) diff --git a/databags/menu+bn-BD.ini b/databags/menu+bn-BD.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+bn-BD.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+de.ini b/databags/menu+de.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+de.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+es.ini b/databags/menu+es.ini deleted file mode 100644 index fd03492..0000000 --- a/databags/menu+es.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = /about/history -label = About - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org -label = Donate diff --git a/databags/menu+es.ini b/databags/menu+es.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+es.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini deleted file mode 100644 index fd03492..0000000 --- a/databags/menu+fr.ini +++ /dev/null @@ -1,19 +0,0 @@ -[about] -path = /about/history -label = About - -[documentation] -path = https://www.torproject.org/docs/documentation.html.en -label = Documentation - -[support] -path = https://support.torproject.org/ -label = Support - -[blog] -path = https://blog.torproject.org -label = Blog - -[donate] -path = https://donate.torproject.org -label = Donate diff --git a/databags/menu+fr.ini b/databags/menu+fr.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+fr.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+id.ini b/databags/menu+id.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+id.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+it.ini b/databags/menu+it.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+it.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+pt-BR.ini b/databags/menu+pt-BR.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+pt-BR.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+tr.ini b/databags/menu+tr.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+tr.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu+zh-CN.ini b/databags/menu+zh-CN.ini new file mode 120000 index 0000000..23a525b --- /dev/null +++ b/databags/menu+zh-CN.ini @@ -0,0 +1 @@ +menu+en.ini \ No newline at end of file diff --git a/databags/menu_footer+bn-BD.ini b/databags/menu_footer+bn-BD.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+bn-BD.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+de.ini b/databags/menu_footer+de.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+de.ini @@ -0,0 +1 @@ +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 100644 index 3329c0a..0000000 --- a/databags/menu_footer+es.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+es.ini b/databags/menu_footer+es.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+es.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini deleted file mode 100644 index 3329c0a..0000000 --- a/databags/menu_footer+fr.ini +++ /dev/null @@ -1,15 +0,0 @@ -[jobs] -path = /about/jobs -label = Jobs - -[blog] -path = https://blog.torproject.org -label = Blog - -[contact] -path = /contact -label = Contact - -[press] -path = /press -label = Press diff --git a/databags/menu_footer+fr.ini b/databags/menu_footer+fr.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+fr.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+id.ini b/databags/menu_footer+id.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+id.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+it.ini b/databags/menu_footer+it.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+it.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+pt-BR.ini b/databags/menu_footer+pt-BR.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+pt-BR.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+tr.ini b/databags/menu_footer+tr.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+tr.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/databags/menu_footer+zh-CN.ini b/databags/menu_footer+zh-CN.ini new file mode 120000 index 0000000..a3178a1 --- /dev/null +++ b/databags/menu_footer+zh-CN.ini @@ -0,0 +1 @@ +menu_footer+en.ini \ No newline at end of file diff --git a/tpo.lektorproject b/tpo.lektorproject index 4e97345..624ceb6 100644 --- a/tpo.lektorproject +++ b/tpo.lektorproject @@ -2,20 +2,55 @@ name = Tor Project Website url = https://www.torproject.org/ url_style = relative -locale = en_US +locale = en [alternatives.en] -name = English +name = English (en) primary = yes url_prefix = / -locale = en_US +locale = en + +[alternatives.bn-BD] +name = বাংলা ভাষা (bn) +url_prefix = /bn-BD/ +locale = bn-BD + +[alternatives.de] +name = Deutsch (de) +url_prefix = /de/ +locale = de [alternatives.es] -name = Español +name = Español (es) url_prefix = /es/ locale = es [alternatives.fr] -name = Français +name = Français (fr) url_prefix = /fr/ locale = fr + +[alternatives.id] +name = Indonesia (id) +url_prefix = /id/ +locale = id + +[alternatives.it] +name = Italiano (it) +url_prefix = /it/ +locale = it + +[alternatives.pt-BR] +name = Português Brasil (pt-BR) +url_prefix = /pt-BR/ +locale = pt-BR + +[alternatives.tr] +name = Türkçe (tr) +url_prefix = /tr/ +locale = tr + +[alternatives.zh-CN] +name = 简体字 (zh-CN) +url_prefix = /zh-CN/ +locale = zh-CN

1 0

[tpo/master] change prefix to staging site so it is more useful for translators
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 5994012628b72d2e21cef55975b8ec5dce538cc5 Author: emma peel <emma.peel(a)riseup.net> Date: Mon Mar 11 05:27:46 2019 +0100 change prefix to staging site so it is more useful for translators --- configs/i18n.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configs/i18n.ini b/configs/i18n.ini index bbac344..533d593 100644 --- a/configs/i18n.ini +++ b/configs/i18n.ini @@ -2,4 +2,4 @@ content = en translations = bn-BD,de,es,fr,id,it,pt-BR,ru,tr,zh-CN i18npath = i18n translate_paragraphwise = False -url_prefix = https://torproject.org/ +url_prefix = 'https://lektor-staging.torproject.org/tpo/staging/'

1 0

[tpo/master] replace http with https link
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 723ee074d7ad27e6d922f57a1eedcd6b15001ad2 Author: emma peel <emma.peel(a)riseup.net> Date: Sat Mar 9 11:11:03 2019 +0100 replace http with https link --- content/about/people/biella-core/contents.lr | 2 +- content/about/people/hellais/contents.lr | 2 +- content/about/people/robgjansen/contents.lr | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/content/about/people/biella-core/contents.lr b/content/about/people/biella-core/contents.lr index 8286394..82d2cd8 100644 --- a/content/about/people/biella-core/contents.lr +++ b/content/about/people/biella-core/contents.lr @@ -14,4 +14,4 @@ image: /static/images/people/biella.png --- description: -[Anthropologist](http://gabriellacoleman.org/) and Wolfe Chair in Scientific and Technological Literacy at McGill University. +[Anthropologist](https://gabriellacoleman.org/) and Wolfe Chair in Scientific and Technological Literacy at McGill University. diff --git a/content/about/people/hellais/contents.lr b/content/about/people/hellais/contents.lr index 893f4c2..6f12140 100644 --- a/content/about/people/hellais/contents.lr +++ b/content/about/people/hellais/contents.lr @@ -14,4 +14,4 @@ image: /static/images/people/hellais.png --- description: -Project leader for [OONI](https://ooni.torproject.org/), has helped with [tor2web](http://tor2web.org/), wrote Atlas which later became [Relay Search](https://metrics.torproject.org/rs.html), and helps improve security. +Project leader for [OONI](https://ooni.torproject.org/), has helped with [tor2web](https://www.tor2web.org/), wrote Atlas which later became [Relay Search](https://metrics.torproject.org/rs.html), and helps improve security. diff --git a/content/about/people/robgjansen/contents.lr b/content/about/people/robgjansen/contents.lr index b3df393..bcc7252 100644 --- a/content/about/people/robgjansen/contents.lr +++ b/content/about/people/robgjansen/contents.lr @@ -14,4 +14,4 @@ image: /static/images/people/robgjansen.png --- description: -[NRL](https://www.nrl.navy.mil/) research scientist, [leading expert in Tor network performance](http://www.robgjansen.com/), and author of [Shadow](https://shadow.github.io/). +[NRL](https://www.nrl.navy.mil/) research scientist, [leading expert in Tor network performance](https://www.robgjansen.com/), and author of [Shadow](https://shadow.github.io/).

1 0

[tpo/master] text more vague so we dont need updates
by hiro＠torproject.org 14 Mar '19

14 Mar '19

commit 956dd9b0c9e2c1952d06be65b5d080216f297d6c Author: emma peel <emma.peel(a)riseup.net> Date: Mon Mar 11 12:41:05 2019 +0100 text more vague so we dont need updates --- content/about/sponsors/sida/contents.lr | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/content/about/sponsors/sida/contents.lr b/content/about/sponsors/sida/contents.lr index 0d9f8f5..46d69ae 100644 --- a/content/about/sponsors/sida/contents.lr +++ b/content/about/sponsors/sida/contents.lr @@ -14,5 +14,5 @@ link: https://www.sida.se/English/ --- description: -Sida is a government agency working on behalf of the Swedish parliament and government to help implement Sweden’s Policy for Global Development, with the mission to reduce poverty in the world. -We are using this grant to improve usability and community training in support of democracy and human rights in Uganda and Colombia. +Sida is a government agency working on behalf of the Swedish parliament and government, with the mission to reduce poverty in the world. +Through their work and in cooperation with others, Sida contributes to implementing Sweden’s Policy for Global Development.

1 0