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

[tpo/staging] Fix various typos
by emmapeel＠torproject.org 26 Apr '19

26 Apr '19

commit fbe8b77de66c1dc03e85d0a5854d4aaad45d6de1 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 19:21:46 2019 +0200 Fix various typos --- content/about/reports/2011-form-pc/contents.lr | 2 +- .../torbrowser/RecommendedTBBVersions/contents.lr | 15 +-------------- models/text.ini | 2 +- 3 files changed, 3 insertions(+), 16 deletions(-) diff --git a/content/about/reports/2011-form-pc/contents.lr b/content/about/reports/2011-form-pc/contents.lr index c9181ef..7d5b541 100644 --- a/content/about/reports/2011-form-pc/contents.lr +++ b/content/about/reports/2011-form-pc/contents.lr @@ -6,7 +6,7 @@ date: 2011 --- tags: FISCAL YEAR --- -title: 2011 Steate of MA Form PC +title: 2011 State of MA Form PC --- _hidden: yes --- diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 4a5c3ba..56a3483 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -4,17 +4,4 @@ _template: empty.html --- body: -[ -"8.0.8", -"8.0.8-MacOS", -"8.0.8-Linux", -"8.0.8-Windows", -"8.5a10", -"8.5a10-MacOS", -"8.5a10-Linux", -"8.5a10-Windows", -"8.5a11", -"8.5a11-MacOS", -"8.5a11-Linux", -"8.5a11-Windows" -] +["8.0.8", "8.0.8-MacOS", "8.0.8-Linux", "8.0.8-Windows", "8.5a10", "8.5a10-MacOS", "8.5a10-Linux", "8.5a10-Windows"] diff --git a/models/text.ini b/models/text.ini index 75e24ba..3d57509 100644 --- a/models/text.ini +++ b/models/text.ini @@ -4,4 +4,4 @@ label = Text [fields.body] label = Body -type = text +type = html

1 0

[tpo/staging] Fix svg fallback
by emmapeel＠torproject.org 26 Apr '19

26 Apr '19

commit 76423c43754cb114c00880128f9bfbdd44180763 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 18:31:25 2019 +0200 Fix svg fallback --- templates/download.html | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/templates/download.html b/templates/download.html index f86fc73..9ce330c 100644 --- a/templates/download.html +++ b/templates/download.html @@ -1,8 +1,8 @@ <div class="container py-3"> <div class="row"> <div class="col-sm-6"> - <div class="col-md-8 order-1"> - <img src="{{ '/static/images/download/get-connected.svg'|asseturl }}" class="" alt="{{ _("Get Connected") }}" /> + <div class="col-md-8 order-1 illo-container"> + <img src="{{ '/static/images/download/png/get-connected(a)3x.png'|asseturl }}" class="" alt="{{ _("Get Connected") }}" /> </div> <h3 class="text-primary">{{ _('Get connected') }}</h3> <div class="row pl-3 pr-5 text-tpo"> @@ -15,8 +15,8 @@ </div> </div> <div class="col-sm-6"> - <div class="col-md-8 order-1"> - <img src="{{ '/static/images/download/stay-safe.svg'|asseturl }}" class="" alt="{{ _("Stay safe") }}" /> + <div class="col-md-8 order-1 illo-container"> + <img src="{{ '/static/images/download/png/stay-safe(a)3x.png'|asseturl }}" class="" alt="{{ _("Stay safe") }}" /> </div> <h3 class="text-primary">{{ _('Stay safe') }}</h3> <div class="row pl-3 pr-5 text-tpo">

1 0

[tpo/staging] Update download.html
by emmapeel＠torproject.org 26 Apr '19

26 Apr '19

commit cb6f12c4475f5c29ca6fd748ebaccebdc38731f4 Author: Antonela <hola(a)antonela.me> Date: Tue Apr 16 12:51:24 2019 -0300 Update download.html --- templates/download.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/download.html b/templates/download.html index d5a2a29..f86fc73 100644 --- a/templates/download.html +++ b/templates/download.html @@ -12,7 +12,7 @@ <div class="row pl-3 pr-5 text-tpo"> <p class="text-tpo">{{ _('If Tor is not censored, one of the most common reasons Tor won\'t connect is an incorrect system clock. Please make sure it\'s set correctly.') }}</p> <h6><a href="https://support.torproject.org/{{ this.alt }}" title="{{ _('Support Portal') }}">{{ _('Read other FAQ\'s at our Support Portal') }}</a></h6> -</div> + </div> </div> <div class="col-sm-6"> <div class="col-md-8 order-1">

1 0

[translation/support-portal] Update translations for support-portal
by translation＠torproject.org 26 Apr '19

26 Apr '19

commit 6a9872369c5822130e8bcecf58f66aa649795879 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 14:50:57 2019 +0000 Update translations for support-portal --- contents+zh-TW.po | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index fc36d115e..0c431be93 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -2,6 +2,7 @@ # 孟邦王, 2019 # erinm, 2019 # Emma Peel, 2019 +# Hsiu-Ming Chang <cges30901(a)gmail.com>, 2019 # msgid "" msgstr "" @@ -9,7 +10,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-04-25 10:51+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Emma Peel, 2019\n" +"Last-Translator: Hsiu-Ming Chang <cges30901(a)gmail.com>, 2019\n" "Language-Team: Chinese (Taiwan) (https://www.transifex.com/otf/teams/1519/zh_TW/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -1543,6 +1544,9 @@ msgid "" "add more. Want to help us translate? [See here](https://tb-" "manual.torproject.org/becoming-tor-translator/)" msgstr "" +"我們想讓任何人都可以用他們的語言享受洋蔥路由瀏覽器。洋蔥路由瀏覽器現在有 25 " +"種不同的語言的版本，並且我們努力加入更多。想要幫助我們翻譯嗎？[看這裡](https://tb-manual.torproject.org" +"/becoming-tor-translator/)" #: https//support.torproject.org/tbb/tbb-37/ #: (content/tbb/tbb-37/contents+en.lrquestion.description)

1 0

[translation/tpo-web] Update translations for tpo-web
by translation＠torproject.org 26 Apr '19

26 Apr '19

commit 889e98fea2eba5d7a48ad2be79f11205975520b1 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 14:50:36 2019 +0000 Update translations for tpo-web --- contents+zh-TW.po | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/contents+zh-TW.po b/contents+zh-TW.po index e964c26f5..a55ca2477 100644 --- a/contents+zh-TW.po +++ b/contents+zh-TW.po @@ -62,7 +62,7 @@ msgstr "洋蔥路由專案" #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.body) msgid "### Get Support" -msgstr "" +msgstr "### 取得支援" #: https//www.torproject.org/contact/ #: (content/contact/contents+en.lrpage.body) @@ -71,6 +71,8 @@ msgid "" "answers to frequently asked questions about connecting to Tor, circumventing" " censorship, using onion services, and more." msgstr "" +"需要幫助嗎？訪問我們的[支援頁面](https://support.torproject.org) 來獲得關於連線到 " +"Tor、規避審查、使用洋蔥服務等常見問題的回答。" #: https//www.torproject.org/download/ #: (content/download/contents+en.lrpage.title) @@ -132,7 +134,7 @@ msgstr "成功" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "You're equipped to browse freely." -msgstr "" +msgstr "您可以自由瀏覽。" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) @@ -144,14 +146,14 @@ msgstr "Tor 是保障隱私權與網路自由最強而有力的工具。" msgid "" "It is free and open source software maintained by the Tor Project and a " "community of volunteers worldwide." -msgstr "" +msgstr "這是一個由 Tor 計劃和全世界的志願者社群維護的自由與開放原始碼軟體。" #: https//www.torproject.org/thank-you/ #: (content/thank-you/contents+en.lrpage.body) msgid "" "We need your help to keep Tor secure and safe for millions across the globe." " [Donate Now](https://donate.torproject.org/)" -msgstr "" +msgstr "我們需要您的幫助以確保 Tor 對全球數百萬用戶的保密和安全。[現在捐款](https://donate.torproject.org/)" #: https//www.torproject.org/about/ (content/about/contents+en.lrpage.title) #: https//www.torproject.org/about/history/ @@ -169,7 +171,7 @@ msgstr "下載洋蔥路由瀏覽器 Alpha" msgid "" "Before we release a stable version of our software, we release an alpha " "version to test features and find bugs." -msgstr "" +msgstr "在我們發佈我們軟體的穩定版本前，我們會發佈一個 alpha 版本來測試功能並尋找錯誤。" #: https//www.torproject.org/download/alpha/ #: (content/download/alpha/contents+en.lrpage.body) @@ -179,6 +181,8 @@ msgid "" "bugs](https://trac.torproject.org/projects/tor/wiki/doc/community/HowToRepo…," " and are not putting yourself at risk." msgstr "" +"如果你能接受有些地方沒有正常運作，請只下載 alpha " +"版本，想幫助我們找到並[回報錯誤](https://trac.torproject.org/projects/tor/wiki/doc/communi…" #: https//www.torproject.org/download/languages/ #: (content/download/languages/contents+en.lrpage.title) @@ -193,18 +197,21 @@ msgid "" "add more. Want to help us translate? [See here](https://tb-" "manual.torproject.org/becoming-tor-translator/)" msgstr "" +"我們想讓任何人都可以用他們的語言享受洋蔥路由瀏覽器。洋蔥路由瀏覽器現在有 25 " +"種不同的語言的版本，並且我們努力加入更多。想要幫助我們翻譯嗎？[看這裡](https://tb-manual.torproject.org" +"/becoming-tor-translator/)" #: https//www.torproject.org/download/tor/ #: (content/download/tor/contents+en.lrpage.title) msgid "Download Tor Source Code" -msgstr "" +msgstr "下載 Tor 原始碼" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body) msgid "" "The Tor Project, Inc, became a 501(c)3 nonprofit in 2006, but the idea of " "\"onion routing\" began in the mid 1990s." -msgstr "" +msgstr "Tor Project, Inc 在 2006 年成為 501(c)3 非營利組織，但「洋蔥路由」的概念始於 1990 年代中期。" #: https//www.torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0

[tpo/staging] Fix download link in spanish
by emmapeel＠torproject.org 26 Apr '19

26 Apr '19

commit bc1cf651159af0fea52dcc333a7549341b701c12 Author: hiro <hiro(a)torproject.org> Date: Tue Apr 23 10:12:03 2019 +0200 Fix download link in spanish --- templates/macros/downloads.html | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/templates/macros/downloads.html b/templates/macros/downloads.html index 6bddbb0..742e115 100644 --- a/templates/macros/downloads.html +++ b/templates/macros/downloads.html @@ -2,6 +2,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link_64 = download_prefix + 'torbrowser-install-win64-' + version + '_' + alt + '.exe' %} {% set download_link_32 = download_prefix + 'torbrowser-install-' + version + '_' + alt + '.exe' %} @@ -15,6 +17,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link = download_prefix + 'TorBrowser-' + version + '-osx64' + '_' + alt + '.dmg' %} {% set sig_link = download_link + '.asc' %} @@ -26,6 +30,8 @@ {% set download_prefix = 'https://www.torproject.org/dist/torbrowser/' + version + '/' %} {% if alt == 'en' %} {% set alt = 'en-US' %} + {% elif alt == 'es' %} + {% set alt = 'es-ES' %} {% endif %} {% set download_link_64 = download_prefix + 'tor-browser-linux64-' + version + '_' + alt + '.tar.xz' %} {% set download_link_32 = download_prefix + 'tor-browser-linux32-' + version + '_' + alt + '.tar.xz' %}

1 0

[tpo/staging] Add Tor Browser 8.5a11
by emmapeel＠torproject.org 26 Apr '19

26 Apr '19

commit fa47c502ea52cfe1b8815f7d02f2af71b1afa481 Author: Nicolas Vigier <boklm(a)torproject.org> Date: Wed Apr 17 01:00:07 2019 +0200 Add Tor Browser 8.5a11 --- databags/versions.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databags/versions.ini b/databags/versions.ini index cbba14e..a2edc28 100644 --- a/databags/versions.ini +++ b/databags/versions.ini @@ -4,8 +4,8 @@ release_date = 2019-03-23 win32 = 0.3.5.8 [torbrowser-alpha] -version = 8.5a10 -release_date = 2019-03-25 +version = 8.5a11 +release_date = 2019-04-17 [torbrowser-develop-branch] version = maint-8.0

1 0

[tpo/staging] Add 8.5a11 to RecommendedTBBVersions
by emmapeel＠torproject.org 26 Apr '19

26 Apr '19

commit bf0c550220133715e72cbe638cfb7beaa306c28d Author: Nicolas Vigier <boklm(a)torproject.org> Date: Tue Apr 16 21:35:53 2019 +0200 Add 8.5a11 to RecommendedTBBVersions --- content/projects/torbrowser/RecommendedTBBVersions/contents.lr | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr index 0ab95b1..4a5c3ba 100644 --- a/content/projects/torbrowser/RecommendedTBBVersions/contents.lr +++ b/content/projects/torbrowser/RecommendedTBBVersions/contents.lr @@ -12,5 +12,9 @@ body: "8.5a10", "8.5a10-MacOS", "8.5a10-Linux", -"8.5a10-Windows" +"8.5a10-Windows", +"8.5a11", +"8.5a11-MacOS", +"8.5a11-Linux", +"8.5a11-Windows" ]

1 0

[tpo/staging] Update footer
by emmapeel＠torproject.org 26 Apr '19

26 Apr '19

commit a5eb778fef738712f65236ccc792466cd9433ece Author: hiro <hiro(a)torproject.org> Date: Tue Apr 16 21:31:44 2019 +0200 Update footer --- templates/download-android.html | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/templates/download-android.html b/templates/download-android.html index 957c4ad..6392e95 100644 --- a/templates/download-android.html +++ b/templates/download-android.html @@ -14,18 +14,35 @@ <div class="row"> <h3 class="mx-auto defend text-white">{{ _('Protect yourself against tracking, surveillance, and censorship.') }}</h3> </div> + </div> + <div class="d-none d-lg-block col-lg-4"> + <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> + </div> + </div> + <div class="row col-lg-10 mx-auto"> + <div class="col-lg-12 py-5 mt-5"> <div class="row my-5"> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://dist.torproject.org/torbrowser/8.5a10/tor-browser-8.5a10-android-ar…">{{ _('Download .apk') }}</a> - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + <div class="col-md-6 col-sm-4 text-center p1"> + <div class="row"> + {% set t = bag('versions', 'torbrowser-alpha') %} + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">arm</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-armv7-multi.apk.asc"><small>{{ _('sig') }}</small></a> + <a class="btn btn-lg btn-light text-primary py-1 px-4 my-1" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk">{{ _('Download .apk') }} <small class="badge-pill badge-dark mx-1 nick">x86</small></a> + <a class="btn btn-primary btn-sm nick mx-3 my-2" href="https://dist.torproject.org/torbrowser/{{ t.version }}/tor-browser-{{ t.version }}-android-x86-multi.apk.asc"><small>{{ _('sig') }}</small></a> + </div> + </div> + <div class="col-md-3 col-sm-4 text-center p1"> + <a class="btn btn-lg btn-light text-primary py-3 my-1" href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Go to Google Play') }}</a> + </div> {% from "macros/downloads.html" import render_fdroid %} - <a class="btn btn-lg btn-light text-primary py-3 px-4 my-1 mx-auto disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> + <div class="col-md-3 col-sm-4 text-center p1"> + <a class="btn btn-lg btn-light text-primary py-3 my-1 disabled" href="">{{ _('Go to F-droid %s')|format(render_fdroid())|safe }}</a> +  + </div> </div> <div class="row"> <a class="text-light mx-auto nick" href="https://itunes.apple.com/us/app/onion-browser/id519296448?mt=8">{{ _('Are you a iOS user? We encourage you to try Onion Browser.') }} </a> </div> </div> - <div class="d-none d-lg-block col-lg-4"> - <img class="img-fluid p-5" height="auto" src="{{ 'static/images/tor-browser-mobile-window/png/TBAa-onboarding(a)2x.png'|asseturl }}"> - </div> </div> </div>

1 0

[translation/tor_outreach_md] Update translations for tor_outreach_md
by translation＠torproject.org 26 Apr '19

26 Apr '19

commit 4671c38f394f3a50ddb92a13a7418b5e64faf11d Author: Translation commit bot <translation(a)torproject.org> Date: Thu Apr 25 14:21:01 2019 +0000 Update translations for tor_outreach_md --- tor-outreach2019-2020-zh_CN.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/tor-outreach2019-2020-zh_CN.md b/tor-outreach2019-2020-zh_CN.md index aa9d0c4ec..495471975 100644 --- a/tor-outreach2019-2020-zh_CN.md +++ b/tor-outreach2019-2020-zh_CN.md @@ -1,22 +1,22 @@ -# Tor Outreach Material 2019-2020 +# Tor推广材料 2019-2020 # 1. 为了隐私的Tor ### 隐私是一项人权 -Like many of us, Aleisha spends most of her time online--connecting with friends, posting on social media, and browsing the web. +像我们中的许多人一样，Aleisha将大部分时间花在网上——与朋友联系，在社交媒体上发布以及浏览网页。 -But lately, she's noticed that advertisements related to her previous searches are following her around online. +但是最近，她注意到与之前她搜索相关的广告在网上追踪她。 -This feels so invasive that she does some research on online ads and learns that it's not just advertisers tracking her but also her ISP, analytics companies, social media platforms, and more. +这种感觉非常具有侵略性，所以她对在线广告进行了一些研究，并了解到不仅是广告客户追踪她，还有她的服务商，分析公司，社交媒体平台等等也在追踪她。 -Aleisha decides she wants to find and use software that doesn't collect her data, doesn't track her, and doesn't tell other services anything private about her. +Aleisha决定她要找到并使用不收集她数据，不跟踪她，也不会告诉其他服务任何关于她的私人信息的软件。 -She goes to a privacy training at a local hackerspace and learns about **Tor Browser**, the only web browser that allows her to browse anonymously. +她参加了当地黑客空间的隐私培训，并了解到了**Tor Browser**，这是唯一能让她匿名浏览的网络浏览器。 --- -# 2.TOR FOR FEMINISTS +# 2. 为了女权的Tor ### The future is cyberfeminist @@ -36,7 +36,7 @@ She also uses a Tor-powered app called **OnionShare** to send files to other act --- -# 3. TOR FOR HUMAN RIGHTS +# 3. 为了人权的Tor ### 水是生命之源 @@ -58,9 +58,9 @@ All of this software uses Tor to help protect Jelani’s privacy. --- -# 4. TOR FOR ANTI-CENSORSHIP +# 4. 为了反审查的Tor -### Build bridges not walls +### 造桥而非建墙 Jean was traveling for the first time to a country far from his family. @@ -90,17 +90,17 @@ With Tor Browser, Jean can browse freely and privately and contact his family. --- -# 5. Shared Sections +# 5. 分享部分 ## 什么是 Tor？ -Tor is free software and an open network that helps protect you from tracking, surveillance, and censorship online. -Tor is created for free by a 501(c)3 U.S.-based nonprofit called the Tor Project. +Tor是免费软件和开放式网络，有助于保护您免受在线跟踪，监控和审查。 +Tor由一家名为Tor Project的501(c)3美国非营利组织免费创建。 -The easiest way to use Tor is Tor Browser. -When you use Tor Browser, no one can see what websites you visit or where in the world you’re coming from. +使用Tor的最简单方法是Tor Browser。 +当您使用Tor Browser时，没有人能够看到您访问的是哪个网站或您来自世界的哪个位置。 -Other applications, like SecureDrop and OnionShare, use Tor to protect their users against surveillance and censorship. +其他应用程序，如SecureDrop和OnionShare，使用Tor来保护其用户免受监视和审查。 ## 6. How does Tor work?

1 0