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

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 695e3bbb021f256c96aab82289c2c75ba736df58 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 17:38:20 2019 +0100 Update lego --- lego | 2 +- templates/homepage.html | 1 - templates/layout.html | 1 - templates/meta.html | 3 +-- 4 files changed, 2 insertions(+), 5 deletions(-) diff --git a/lego b/lego index 740a29c..d110f07 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 740a29c997e87c75f48bc58d85cc2572a35154e0 +Subproject commit d110f07b4e4abea653b88d112587a929fe433099 diff --git a/templates/homepage.html b/templates/homepage.html index 43663a7..0710d17 100644 --- a/templates/homepage.html +++ b/templates/homepage.html @@ -18,7 +18,6 @@ </div> </div> </div> - {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html> diff --git a/templates/layout.html b/templates/layout.html index e626e2c..ab0e998 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -12,7 +12,6 @@ </div> </div> </div> - {% include 'bottom_banner.html' %} {% include 'footer.html' %} </body> </html> diff --git a/templates/meta.html b/templates/meta.html index 1e82327..3675f20 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -11,9 +11,8 @@ <meta property="og:title" content="{{ _('The Tor Project | Privacy & Freedom Online') }}" /> <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> <meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> -<link rel="stylesheet" href="{{ '/static/css/digital-climate-strike/main.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/css/eoy.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> +<link rel="stylesheet" href="{{ '/static/css/eoy.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">  <link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico">

1 0

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 68570d9f642122a6c58777429c6e30d30e7fb7d8 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 17:48:44 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index d110f07..9166e8d 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit d110f07b4e4abea653b88d112587a929fe433099 +Subproject commit 9166e8dee91b8e8c4148d750aafece458693ed3c

1 0

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 24e65e90e5c3df33303ee5ea73bad185b774de9b Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 17:58:55 2019 +0100 Update lego --- lego | 2 +- templates/banner.html | 1 + templates/bottom_banner.html | 1 - templates/meta.html | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lego b/lego index 9166e8d..2a4a75d 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 9166e8dee91b8e8c4148d750aafece458693ed3c +Subproject commit 2a4a75da799b40b1c6e9054410306719bceb43eb 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/bottom_banner.html b/templates/bottom_banner.html deleted file mode 120000 index 71f1dc9..0000000 --- a/templates/bottom_banner.html +++ /dev/null @@ -1 +0,0 @@ -../lego/templates/bottom_banner.html \ No newline at end of file diff --git a/templates/meta.html b/templates/meta.html index 3675f20..17c7e0b 100644 --- a/templates/meta.html +++ b/templates/meta.html @@ -12,7 +12,6 @@ <meta property="og:description" content="{{ _('Defend yourself against tracking and surveillance. Circumvent censorship.') }}" /> <meta property="og:image" content="https://www.torproject.org/static/images/tor-project-logo-onions.png" /> <link rel="stylesheet" href="{{ '/static/css/bootstrap.css'|asseturl }}"> -<link rel="stylesheet" href="{{ '/static/css/eoy.css'|asseturl }}"> <link rel="stylesheet" href="{{ '/static/fonts/fontawesome/css/all.min.css'|asseturl }}" rel="stylesheet">  <link rel="icon" type="image/x-icon" href="https://www.torproject.org/static/images/favicon/favicon.ico">

1 0

[tpo/staging] Merge branch 'develop'
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit aa27500a6204fbf5032a3712f876e06ec5b43a13 Merge: a260d8f d324d1d Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 18:21:24 2019 +0100 Merge branch 'develop' lego | 2 +- templates/banner.html | 1 + templates/bottom_banner.html | 1 - templates/meta.html | 2 -- 4 files changed, 2 insertions(+), 4 deletions(-)

1 0

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit 1814855746e33f5037e6b578b362c9f1b7a0a125 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 21:04:04 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 08f767b..1ade3bb 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 08f767bc33c462c2bc3ae8dd05039c6c3c6d7f39 +Subproject commit 1ade3bbac5071fa061a1290cda4acad8ae3b6f1d

1 0

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit dbafc87b3d07ffb2fa63d281a907325521f75562 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 18:04:08 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 2a4a75d..fe127cd 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 2a4a75da799b40b1c6e9054410306719bceb43eb +Subproject commit fe127cd3a0230db6b7baebc21473959a4a7b62ab

1 0

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit d324d1d75f52984578c1ded3c77e344f5a8ae3b9 Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 18:19:47 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index 5013ac8..08f767b 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit 5013ac80deb2ca22bd4146fca141da7f44036e9d +Subproject commit 08f767bc33c462c2bc3ae8dd05039c6c3c6d7f39

1 0

[tpo/staging] Update lego
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit c9e65d837998f25380b57d87827932532711259f Author: hiro <hiro(a)torproject.org> Date: Mon Oct 28 18:06:20 2019 +0100 Update lego --- lego | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lego b/lego index fe127cd..5013ac8 160000 --- a/lego +++ b/lego @@ -1 +1 @@ -Subproject commit fe127cd3a0230db6b7baebc21473959a4a7b62ab +Subproject commit 5013ac80deb2ca22bd4146fca141da7f44036e9d

1 0

[tpo/master] make more strings translatable on the templates folder
by emmapeel＠torproject.org 06 Nov '19

06 Nov '19

commit ac549585e12b45629280a289559a0277a8c522c5 Author: emma peel <emma.peel(a)riseup.net> Date: Wed Nov 6 11:03:12 2019 +0100 make more strings translatable on the templates folder --- templates/download-languages.html | 6 +++--- templates/download-options.html | 10 +++++----- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/download-languages.html b/templates/download-languages.html index 2fd0372..4f7ec02 100644 --- a/templates/download-languages.html +++ b/templates/download-languages.html @@ -9,9 +9,9 @@ <thead> <tr> <th scope="col">{{ _('Language') }}</th> - <th scope="col">Windows</th> - <th scope="col">macOS</th> - <th scope="col">GNU/Linux</th> + <th scope="col">{{ _('Windows') }}</th> + <th scope="col">{{ _('macOS') }}</th> + <th scope="col">{{ _('GNU/Linux') }}</th> </tr> </thead> <tbody> diff --git a/templates/download-options.html b/templates/download-options.html index 075b158..0b8e663 100644 --- a/templates/download-options.html +++ b/templates/download-options.html @@ -9,9 +9,9 @@ <thead> <tr> <th scope="col">{{ _('Language') }}</th> - <th scope="col">Windows</th> - <th scope="col">MacOS</th> - <th scope="col">GNU/Linux</th> + <th scope="col">{{ _('Windows') }}</th> + <th scope="col">{{ _('MacOS') }}</th> + <th scope="col">{{ _('GNU/Linux') }}</th> </tr> </thead> <tbody> @@ -40,13 +40,13 @@ <table class="table"> <thead> <tr> - <th>Tor Browser for Android Alpha</th> + <th>{{ _('Tor Browser for Android Alpha') }}</th> </tr> </thead> <tbody> <tr> <td> - <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">Google Play</a> + <a href="https://play.google.com/store/apps/details?id=org.torproject.torbrowser_alp…">{{ _('Google Play') }}</a> </td> </tr> {% from "macros/downloads.html" import render_android %}

1 0

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

06 Nov '19

commit c985258173b6f9e2b8065404fb0e260ac4a4f7af Author: Translation commit bot <translation(a)torproject.org> Date: Wed Nov 6 09:53:37 2019 +0000 https://gitweb.torproject.org/translation.git/commit/?h=support-portal --- contents+th.po | 6 +++--- contents+tr.po | 8 +++++--- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/contents+th.po b/contents+th.po index e1897c938..0776aa6a4 100644 --- a/contents+th.po +++ b/contents+th.po @@ -1,5 +1,4 @@ # Translators: -# Emma Peel, 2019 # Ben CM <nebben10814(a)gmail.com>, 2019 # Pimsiri Petchnamrob <p.petchnamrob(a)gmail.com>, 2019 # Chumapron Waaddao <chumaporn.t(a)gmail.com>, 2019 @@ -8,6 +7,7 @@ # erinm, 2019 # Kunanyaporn Jirasamatakij <kunanyaporn(a)gmail.com>, 2019 # Krittiya Chankasem <ordinaryjane(a)gmail.com>, 2019 +# Emma Peel, 2019 # msgid "" msgstr "" @@ -15,7 +15,7 @@ msgstr "" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-10-29 12:09+CET\n" "PO-Revision-Date: 2018-10-02 22:41+0000\n" -"Last-Translator: Krittiya Chankasem <ordinaryjane(a)gmail.com>, 2019\n" +"Last-Translator: Emma Peel, 2019\n" "Language-Team: Thai (https://www.transifex.com/otf/teams/1519/th/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -8159,7 +8159,7 @@ msgstr "บริจาคตอนนี้" #: lego/templates/banner.html:19 templates/banner.html:19 msgid "Give today, and Mozilla will match your donation." -msgstr "" +msgstr "บริจาควันนี้และมอซิลลาจะสมทบเท่ากับที่คุณให้" #: lego/templates/footer.html:9 lego/templates/footer.html:18 #: lego/templates/navbar.html:74 templates/footer.html:9 diff --git a/contents+tr.po b/contents+tr.po index 5d2d55745..ad3fc57fb 100644 --- a/contents+tr.po +++ b/contents+tr.po @@ -5895,22 +5895,24 @@ msgstr "" #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.title) msgid "How stable does my relay need to be?" -msgstr "" +msgstr "Aktarıcımın ne kadar kararlı olması gerekir?" #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) msgid "We aim to make setting up a Tor relay easy and convenient:" -msgstr "" +msgstr "Tor aktarıcısı kurulumunun kolay ve rahat olmasını amaçlıyoruz:" #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) msgid "* It's fine if the relay goes offline sometimes." -msgstr "" +msgstr "* Aktarıcının arada bir devre dışı kalması sorun olmaz." #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description) msgid "The directories notice this quickly and stop advertising the relay." msgstr "" +"Dizindeki bilgisayarlar bu durumu hemen fark eder ve bu aktarıcıyı " +"yayınlamayı bırakır." #: https//support.torproject.org/operators/relay-flexible/ #: (content/operators/relay-flexible/contents+en.lrquestion.description)

1 0