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

[translation/tails-persistence-setup_completed] Update translations for tails-persistence-setup_completed
by translation＠torproject.org 17 Jan '19

17 Jan '19

commit 3249f88bf85667fb67e8e903884b060660c71d3a Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 20:46:58 2019 +0000 Update translations for tails-persistence-setup_completed --- da/da.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/da.po b/da/da.po index 28e3d19c3..ce582a300 100644 --- a/da/da.po +++ b/da/da.po @@ -6,7 +6,7 @@ # Anders Damsgaard <andersd(a)riseup.net>, 2013 # Christian Villum <villum(a)autofunk.dk>, 2014 # David Nielsen <gnomeuser(a)gmail.com>, 2015 -# scootergrisen, 2017-2018 +# scootergrisen, 2017-2019 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015 # Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013 # Whiz Zurrd <Whizzurrd(a)hmamail.com>, 2014 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-11-01 12:21+0100\n" -"PO-Revision-Date: 2019-01-15 12:21+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-01-17 20:24+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +111,7 @@ msgstr "Personlig data" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "Keep files stored in the `Persistent' directory" -msgstr "Behold filer i \"vedvarende\"-mappen" +msgstr "Behold filer i \"Vedvarende\"-mappen" #: ../lib/Tails/Persistence/Configuration/Presets.pm:71 msgid "Browser Bookmarks"

1 0

[translation/tails-persistence-setup] Update translations for tails-persistence-setup
by translation＠torproject.org 17 Jan '19

17 Jan '19

commit 864767313818c3664fbbe0f73edc1bf0e21ab7ef Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 20:46:52 2019 +0000 Update translations for tails-persistence-setup --- da/da.po | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/da/da.po b/da/da.po index 28e3d19c3..ce582a300 100644 --- a/da/da.po +++ b/da/da.po @@ -6,7 +6,7 @@ # Anders Damsgaard <andersd(a)riseup.net>, 2013 # Christian Villum <villum(a)autofunk.dk>, 2014 # David Nielsen <gnomeuser(a)gmail.com>, 2015 -# scootergrisen, 2017-2018 +# scootergrisen, 2017-2019 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015 # Tore Bjørnson <tore.bjornson(a)gmail.com>, 2013 # Whiz Zurrd <Whizzurrd(a)hmamail.com>, 2014 @@ -15,8 +15,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: Tails developers <tails(a)boum.org>\n" "POT-Creation-Date: 2018-11-01 12:21+0100\n" -"PO-Revision-Date: 2019-01-15 12:21+0000\n" -"Last-Translator: erinm\n" +"PO-Revision-Date: 2019-01-17 20:24+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -111,7 +111,7 @@ msgstr "Personlig data" #: ../lib/Tails/Persistence/Configuration/Presets.pm:58 msgid "Keep files stored in the `Persistent' directory" -msgstr "Behold filer i \"vedvarende\"-mappen" +msgstr "Behold filer i \"Vedvarende\"-mappen" #: ../lib/Tails/Persistence/Configuration/Presets.pm:71 msgid "Browser Bookmarks"

1 0

[translation/tails-misc_completed] Update translations for tails-misc_completed
by translation＠torproject.org 17 Jan '19

17 Jan '19

commit e92d74bfd80b214c7f629a48e38055b76fdd06e0 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 20:46:08 2019 +0000 Update translations for tails-misc_completed --- da.po | 44 ++++++++++++++++++++++++++++++++++---------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/da.po b/da.po index 7763a55d8..5ac8b2a1c 100644 --- a/da.po +++ b/da.po @@ -13,16 +13,16 @@ # mort3n <nalholm(a)yahoo.dk>, 2016 # Aesthese, 2013 # Aesthese, 2016 -# scootergrisen, 2017-2018 +# scootergrisen, 2017-2019 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015 # Whiz Zurrd <Whizzurrd(a)hmamail.com>, 2014 msgid "" msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-12-07 10:24+0100\n" -"PO-Revision-Date: 2019-01-11 14:12+0000\n" -"Last-Translator: erinm\n" +"POT-Creation-Date: 2019-01-14 21:20+0100\n" +"PO-Revision-Date: 2019-01-17 20:23+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -104,6 +104,30 @@ msgstr "_Start" msgid "_Exit" msgstr "_Afslut" +#: config/chroot_local-includes/usr/local/bin/keepassx:17 +#, sh-format +msgid "" +"<b><big>Do you want to rename your <i>KeePassX</i> database?</big></b>\n" +"\n" +"You have a <i>KeePassX</i> database in your <i>Persistent</i> folder:\n" +"\n" +"<i>${filename}</i>\n" +"\n" +"Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it automatically in the future." +msgstr "<b><big>Vil du omdøbe din <i>KeePassX</i>-database?</big></b>\n\nDu har en <i>KeePassX</i>-database i din <i>Vedvarende</i>-mappe:\n\n<i>${filename}</i>\n\nHvis den omdøbes til <i>keepassx.kdbx</i>, så kan <i>KeePassX</i> automatisk åbnes i fremtiden." + +#: config/chroot_local-includes/usr/local/bin/keepassx:25 +msgid "Rename" +msgstr "Omdøb" + +#: config/chroot_local-includes/usr/local/bin/keepassx:26 +msgid "Keep current name" +msgstr "Behold nuværende navn" + +#: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21 +msgid "su is disabled. Please use sudo instead." +msgstr "su er deaktiveret. Brug venligst sudo i stedet." + #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart" msgstr "Genstart" @@ -250,7 +274,7 @@ msgid "Remove" msgstr "Fjern" #: config/chroot_local-includes/usr/local/sbin/tails-additional-software:366 -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:118 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:119 #: config/chroot_local-includes/usr/local/bin/tor-browser:46 msgid "Cancel" msgstr "Annuller" @@ -394,23 +418,23 @@ msgid "" "You might prefer to restart Tails and disable MAC spoofing." msgstr "MAC spoofing fejlede for netværkskortet ${nic_name} (${nic}). Fejlretning fejlede også, så al brug af netværk er deaktiveret. \nDu vil måske foretrække at genstarte Tails og slå MAC spoofing fra." -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:109 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:110 msgid "Lock Screen" msgstr "Lås skærm" -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:124 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:125 msgid "Screen Locker" msgstr "Skærmlåser" -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:130 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:131 msgid "Set up a password to unlock the screen." msgstr "Opsæt en adgangskode til at låse skærmen op." -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:135 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:136 msgid "Password" msgstr "Adgangskode" -#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:141 +#: config/chroot_local-includes/usr/local/bin/tails-screen-locker:142 msgid "Confirm" msgstr "Bekræft"

1 0

[translation/tails-misc] Update translations for tails-misc
by translation＠torproject.org 17 Jan '19

17 Jan '19

commit 3287dae0b55897805486f5dc701a364521572d00 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 20:46:02 2019 +0000 Update translations for tails-misc --- da.po | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/da.po b/da.po index 5e9870de1..5ac8b2a1c 100644 --- a/da.po +++ b/da.po @@ -13,7 +13,7 @@ # mort3n <nalholm(a)yahoo.dk>, 2016 # Aesthese, 2013 # Aesthese, 2016 -# scootergrisen, 2017-2018 +# scootergrisen, 2017-2019 # 7110bbed2db4fadc642a4cd0e91bb1b9, 2015 # Whiz Zurrd <Whizzurrd(a)hmamail.com>, 2014 msgid "" @@ -21,8 +21,8 @@ msgstr "" "Project-Id-Version: Tor Project\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-01-14 21:20+0100\n" -"PO-Revision-Date: 2019-01-17 01:47+0000\n" -"Last-Translator: carolyn <carolyn(a)anhalt.org>\n" +"PO-Revision-Date: 2019-01-17 20:23+0000\n" +"Last-Translator: scootergrisen\n" "Language-Team: Danish (http://www.transifex.com/otf/torproject/language/da/)\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -114,19 +114,19 @@ msgid "" "<i>${filename}</i>\n" "\n" "Renaming it to <i>keepassx.kdbx</i> would allow <i>KeePassX</i> to open it automatically in the future." -msgstr "" +msgstr "<b><big>Vil du omdøbe din <i>KeePassX</i>-database?</big></b>\n\nDu har en <i>KeePassX</i>-database i din <i>Vedvarende</i>-mappe:\n\n<i>${filename}</i>\n\nHvis den omdøbes til <i>keepassx.kdbx</i>, så kan <i>KeePassX</i> automatisk åbnes i fremtiden." #: config/chroot_local-includes/usr/local/bin/keepassx:25 msgid "Rename" -msgstr "" +msgstr "Omdøb" #: config/chroot_local-includes/usr/local/bin/keepassx:26 msgid "Keep current name" -msgstr "" +msgstr "Behold nuværende navn" #: config/chroot_local-includes/usr/local/bin/replace-su-with-sudo:21 msgid "su is disabled. Please use sudo instead." -msgstr "" +msgstr "su er deaktiveret. Brug venligst sudo i stedet." #: config/chroot_local-includes/usr/share/gnome-shell/extensions/status-menu-helper@tails.boum.org/extension.js:75 msgid "Restart"

1 0

[tpo/staging] Merge branch 'master' into staging
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 761fecc50c13ec5e227a987ac4ebf2bb62ec35c5 Merge: 57ad436 9a01de7 Author: hiro <hiro(a)torproject.org> Date: Thu Jan 17 21:13:40 2019 +0100 Merge branch 'master' into staging assets/scss/_portal.scss | 2 +- assets/static/bootstrap.css | 2 +- assets/static/images/sponsors/OTF.png | Bin 0 -> 18657 bytes assets/static/images/sponsors/USSD.png | Bin 499319 -> 90079 bytes assets/static/images/sponsors/cymru.png | Bin 18259 -> 16385 bytes assets/static/images/sponsors/darpa.png | Bin 525926 -> 127422 bytes assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes assets/static/images/sponsors/handshake.png | Bin 0 -> 11209 bytes assets/static/images/sponsors/imls.png | Bin 31458 -> 36164 bytes assets/static/images/sponsors/mdf.png | Bin 0 -> 29004 bytes assets/static/images/sponsors/mozilla.png | Bin 0 -> 16327 bytes assets/static/images/sponsors/nsf.png | Bin 1434049 -> 63745 bytes assets/static/images/sponsors/rose.png | Bin 37996 -> 42626 bytes assets/static/images/sponsors/sida.png | Bin 3355 -> 38963 bytes content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mdf/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 2 +- content/about/sponsors/otf/contents.lr | 2 +- templates/layout.html | 2 +- templates/macros/sponsors.html | 6 +++-- templates/sponsors.html | 32 +++++++++++++-------------- 22 files changed, 28 insertions(+), 26 deletions(-)

1 0

[tpo/staging] UI review - sponsors
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 9a01de79bd112ab542f008abf9b832d76d9f3d4c Author: Antonela <hola(a)antonela.me> Date: Thu Jan 17 16:58:54 2019 -0300 UI review - sponsors add sponsor images, review padding, minor ui bugs --- assets/scss/_portal.scss | 2 +- assets/static/bootstrap.css | 2 +- assets/static/images/sponsors/OTF.png | Bin 0 -> 18657 bytes assets/static/images/sponsors/USSD.png | Bin 499319 -> 90079 bytes assets/static/images/sponsors/cymru.png | Bin 18259 -> 16385 bytes assets/static/images/sponsors/darpa.png | Bin 525926 -> 127422 bytes assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes assets/static/images/sponsors/handshake.png | Bin 0 -> 11209 bytes assets/static/images/sponsors/imls.png | Bin 31458 -> 36164 bytes assets/static/images/sponsors/mdf.png | Bin 0 -> 29004 bytes assets/static/images/sponsors/mozilla.png | Bin 0 -> 16327 bytes assets/static/images/sponsors/nsf.png | Bin 1434049 -> 63745 bytes assets/static/images/sponsors/rose.png | Bin 37996 -> 42626 bytes assets/static/images/sponsors/sida.png | Bin 3355 -> 38963 bytes content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mdf/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 2 +- content/about/sponsors/otf/contents.lr | 2 +- templates/layout.html | 2 +- templates/macros/sponsors.html | 6 +++-- templates/sponsors.html | 32 +++++++++++++-------------- 22 files changed, 28 insertions(+), 26 deletions(-) diff --git a/assets/scss/_portal.scss b/assets/scss/_portal.scss index bd6d902..2cd09f3 100644 --- a/assets/scss/_portal.scss +++ b/assets/scss/_portal.scss @@ -47,7 +47,7 @@ text-align: left; } -.description-small { +.description-small, .description-small p { font-size: 16px; width: 95%; } diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css index a5ad318..73863a4 100644 --- a/assets/static/bootstrap.css +++ b/assets/static/bootstrap.css @@ -8652,7 +8652,7 @@ a.text-dark:focus, a.text-dark:hover { text-align: left; } -.description-small { +.description-small, .description-small p { font-size: 16px; width: 95%; } diff --git a/assets/static/images/sponsors/OTF.png b/assets/static/images/sponsors/OTF.png new file mode 100644 index 0000000..6b5d9bb Binary files /dev/null and b/assets/static/images/sponsors/OTF.png differ diff --git a/assets/static/images/sponsors/USSD.png b/assets/static/images/sponsors/USSD.png index de3edeb..a62b096 100644 Binary files a/assets/static/images/sponsors/USSD.png and b/assets/static/images/sponsors/USSD.png differ diff --git a/assets/static/images/sponsors/cymru.png b/assets/static/images/sponsors/cymru.png index f31f95b..8170abb 100644 Binary files a/assets/static/images/sponsors/cymru.png and b/assets/static/images/sponsors/cymru.png differ diff --git a/assets/static/images/sponsors/darpa.png b/assets/static/images/sponsors/darpa.png index be4405f..8a6e79c 100644 Binary files a/assets/static/images/sponsors/darpa.png and b/assets/static/images/sponsors/darpa.png differ diff --git a/assets/static/images/sponsors/fastly.png b/assets/static/images/sponsors/fastly.png new file mode 100644 index 0000000..ba71a3c Binary files /dev/null and b/assets/static/images/sponsors/fastly.png differ diff --git a/assets/static/images/sponsors/handshake.png b/assets/static/images/sponsors/handshake.png new file mode 100644 index 0000000..82bd860 Binary files /dev/null and b/assets/static/images/sponsors/handshake.png differ diff --git a/assets/static/images/sponsors/imls.png b/assets/static/images/sponsors/imls.png index 88a3bdf..20fff7a 100644 Binary files a/assets/static/images/sponsors/imls.png and b/assets/static/images/sponsors/imls.png differ diff --git a/assets/static/images/sponsors/mdf.png b/assets/static/images/sponsors/mdf.png new file mode 100644 index 0000000..2228612 Binary files /dev/null and b/assets/static/images/sponsors/mdf.png differ diff --git a/assets/static/images/sponsors/mozilla.png b/assets/static/images/sponsors/mozilla.png new file mode 100644 index 0000000..614b80d Binary files /dev/null and b/assets/static/images/sponsors/mozilla.png differ diff --git a/assets/static/images/sponsors/nsf.png b/assets/static/images/sponsors/nsf.png index 7c52c69..8e45952 100644 Binary files a/assets/static/images/sponsors/nsf.png and b/assets/static/images/sponsors/nsf.png differ diff --git a/assets/static/images/sponsors/rose.png b/assets/static/images/sponsors/rose.png index 6efe42f..0fa90d0 100644 Binary files a/assets/static/images/sponsors/rose.png and b/assets/static/images/sponsors/rose.png differ diff --git a/assets/static/images/sponsors/sida.png b/assets/static/images/sponsors/sida.png index bb620ee..f6a6802 100644 Binary files a/assets/static/images/sponsors/sida.png and b/assets/static/images/sponsors/sida.png differ diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr index 46088f2..bbd1e20 100644 --- a/content/about/sponsors/fastly/contents.lr +++ b/content/about/sponsors/fastly/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Fastly --- -logo: /static/images/sponsors/fastly.svg +logo: /static/images/sponsors/fastly.png --- link: https://www.fastly.com/ --- diff --git a/content/about/sponsors/handshake/contents.lr b/content/about/sponsors/handshake/contents.lr index bb7f6fd..b39a8b8 100644 --- a/content/about/sponsors/handshake/contents.lr +++ b/content/about/sponsors/handshake/contents.lr @@ -6,7 +6,7 @@ time: 2010 - 2013, 2017 - 2020 --- name: The Handshake Foundation --- -logo: /static/images/sponsors/handshake.svg +logo: /static/images/sponsors/handshake.png --- link: https://handshake.org/ --- diff --git a/content/about/sponsors/mdf/contents.lr b/content/about/sponsors/mdf/contents.lr index bc64470..4eced17 100644 --- a/content/about/sponsors/mdf/contents.lr +++ b/content/about/sponsors/mdf/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Media Democracy Found --- -logo: /static/images/sponsors/mdf.jpg +logo: /static/images/sponsors/mdf.png --- link: http://mediademocracyfund.org/ --- diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index 48ff4f0..4f8fadc 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/content/about/sponsors/mozilla/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Mozilla --- -logo: /static/images/sponsors/mozilla.jpg +logo: /static/images/sponsors/mozilla.png --- link: https://www.mozilla.org/en-US/moss/ --- diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index ef21336..c1dbe2b 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/content/about/sponsors/otf/contents.lr @@ -6,7 +6,7 @@ time: 2012 - 2019 --- name: Open Technology Fund --- -logo: /static/images/sponsors/OTF.jpg +logo: /static/images/sponsors/OTF.png --- link: https://www.opentech.fund/ --- diff --git a/templates/layout.html b/templates/layout.html index 53bf2b8..82e7e5f 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -14,7 +14,7 @@ <div class="container-fluid"> <div class="row flex-xl-nowrap"> <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> - <div class="container py-3 preamble"> + <div class="container py-3 mt-5 preamble"> {{ this.body }} </div> {% include this.html %} diff --git a/templates/macros/sponsors.html b/templates/macros/sponsors.html index f5d53dd..fd7d4a1 100644 --- a/templates/macros/sponsors.html +++ b/templates/macros/sponsors.html @@ -1,9 +1,11 @@ {% macro render_active(item, alternative) %} -<div class="card border-0 col-6"> +<div class="col-4"> +<div class="card border-1"> <img class="card-img-top" src="{{ item.logo|asseturl }}" alt="Card image cap"> <div class="card-body"> - <p class="text-primary description description-small"><u><a href="{{ item.link }}">{{ item.name }}</a></u></p> + <h4><a href="{{ item.link }}">{{ item.name }}</a></h4> <p class="card-text description description-small">{{ item.description }}</p> </div> </div> +</div> {% endmacro %} diff --git a/templates/sponsors.html b/templates/sponsors.html index 8bb08ba..228a582 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -1,20 +1,5 @@ <div class="container py-3"> - <h3 class="text-primary display-5">Past Sponsors</h3> -</div> -<div class="container"> - <div class="row"> - <div class="col-8"> - <ul class="jobs-ul"> - {% set items = this.children %} - {% for item in items.filter(F.active == False) %} - <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> - {% endfor %} - </ul> - </div> - </div> -</div> -<div class="container py-3"> - <h3 class="text-primary display-5">Active Sponsors</h3> +<h3 class="text-primary display-5">Active Sponsors</h3> </div> <div class="container"> <div class="row"> @@ -25,6 +10,21 @@ {% endfor %} </div> </div> +<div class="container py-3"> +<h3 class="text-primary display-5">Past Sponsors</h3> +</div> +<div class="container"> +<div class="row"> + <div class="col-8"> + <ul class="jobs-ul"> + {% set items = this.children %} + {% for item in items.filter(F.active == False) %} + <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> + {% endfor %} + </ul> + </div> +</div> +</div> <div class="container"> <div class="row"> <p>This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data. Further details about our audited and reviewed funding can be found on our Financial Reports page.</p>

1 0

[tpo/staging] Merge pull request #2 from torproject/master
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit c023b91439374f8111c12a2d03578869a4f3b81a Merge: c34d50a 9c31480 Author: Antonela <hola(a)antonela.me> Date: Thu Jan 17 15:31:06 2019 -0300 Merge pull request #2 from torproject/master rebase templates/macros/people.html | 9 +-------- templates/sponsors.html | 47 -------------------------------------------- 2 files changed, 1 insertion(+), 55 deletions(-)

1 0

[tpo/master] UI review - sponsors
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit 9a01de79bd112ab542f008abf9b832d76d9f3d4c Author: Antonela <hola(a)antonela.me> Date: Thu Jan 17 16:58:54 2019 -0300 UI review - sponsors add sponsor images, review padding, minor ui bugs --- assets/scss/_portal.scss | 2 +- assets/static/bootstrap.css | 2 +- assets/static/images/sponsors/OTF.png | Bin 0 -> 18657 bytes assets/static/images/sponsors/USSD.png | Bin 499319 -> 90079 bytes assets/static/images/sponsors/cymru.png | Bin 18259 -> 16385 bytes assets/static/images/sponsors/darpa.png | Bin 525926 -> 127422 bytes assets/static/images/sponsors/fastly.png | Bin 0 -> 10142 bytes assets/static/images/sponsors/handshake.png | Bin 0 -> 11209 bytes assets/static/images/sponsors/imls.png | Bin 31458 -> 36164 bytes assets/static/images/sponsors/mdf.png | Bin 0 -> 29004 bytes assets/static/images/sponsors/mozilla.png | Bin 0 -> 16327 bytes assets/static/images/sponsors/nsf.png | Bin 1434049 -> 63745 bytes assets/static/images/sponsors/rose.png | Bin 37996 -> 42626 bytes assets/static/images/sponsors/sida.png | Bin 3355 -> 38963 bytes content/about/sponsors/fastly/contents.lr | 2 +- content/about/sponsors/handshake/contents.lr | 2 +- content/about/sponsors/mdf/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 2 +- content/about/sponsors/otf/contents.lr | 2 +- templates/layout.html | 2 +- templates/macros/sponsors.html | 6 +++-- templates/sponsors.html | 32 +++++++++++++-------------- 22 files changed, 28 insertions(+), 26 deletions(-) diff --git a/assets/scss/_portal.scss b/assets/scss/_portal.scss index bd6d902..2cd09f3 100644 --- a/assets/scss/_portal.scss +++ b/assets/scss/_portal.scss @@ -47,7 +47,7 @@ text-align: left; } -.description-small { +.description-small, .description-small p { font-size: 16px; width: 95%; } diff --git a/assets/static/bootstrap.css b/assets/static/bootstrap.css index a5ad318..73863a4 100644 --- a/assets/static/bootstrap.css +++ b/assets/static/bootstrap.css @@ -8652,7 +8652,7 @@ a.text-dark:focus, a.text-dark:hover { text-align: left; } -.description-small { +.description-small, .description-small p { font-size: 16px; width: 95%; } diff --git a/assets/static/images/sponsors/OTF.png b/assets/static/images/sponsors/OTF.png new file mode 100644 index 0000000..6b5d9bb Binary files /dev/null and b/assets/static/images/sponsors/OTF.png differ diff --git a/assets/static/images/sponsors/USSD.png b/assets/static/images/sponsors/USSD.png index de3edeb..a62b096 100644 Binary files a/assets/static/images/sponsors/USSD.png and b/assets/static/images/sponsors/USSD.png differ diff --git a/assets/static/images/sponsors/cymru.png b/assets/static/images/sponsors/cymru.png index f31f95b..8170abb 100644 Binary files a/assets/static/images/sponsors/cymru.png and b/assets/static/images/sponsors/cymru.png differ diff --git a/assets/static/images/sponsors/darpa.png b/assets/static/images/sponsors/darpa.png index be4405f..8a6e79c 100644 Binary files a/assets/static/images/sponsors/darpa.png and b/assets/static/images/sponsors/darpa.png differ diff --git a/assets/static/images/sponsors/fastly.png b/assets/static/images/sponsors/fastly.png new file mode 100644 index 0000000..ba71a3c Binary files /dev/null and b/assets/static/images/sponsors/fastly.png differ diff --git a/assets/static/images/sponsors/handshake.png b/assets/static/images/sponsors/handshake.png new file mode 100644 index 0000000..82bd860 Binary files /dev/null and b/assets/static/images/sponsors/handshake.png differ diff --git a/assets/static/images/sponsors/imls.png b/assets/static/images/sponsors/imls.png index 88a3bdf..20fff7a 100644 Binary files a/assets/static/images/sponsors/imls.png and b/assets/static/images/sponsors/imls.png differ diff --git a/assets/static/images/sponsors/mdf.png b/assets/static/images/sponsors/mdf.png new file mode 100644 index 0000000..2228612 Binary files /dev/null and b/assets/static/images/sponsors/mdf.png differ diff --git a/assets/static/images/sponsors/mozilla.png b/assets/static/images/sponsors/mozilla.png new file mode 100644 index 0000000..614b80d Binary files /dev/null and b/assets/static/images/sponsors/mozilla.png differ diff --git a/assets/static/images/sponsors/nsf.png b/assets/static/images/sponsors/nsf.png index 7c52c69..8e45952 100644 Binary files a/assets/static/images/sponsors/nsf.png and b/assets/static/images/sponsors/nsf.png differ diff --git a/assets/static/images/sponsors/rose.png b/assets/static/images/sponsors/rose.png index 6efe42f..0fa90d0 100644 Binary files a/assets/static/images/sponsors/rose.png and b/assets/static/images/sponsors/rose.png differ diff --git a/assets/static/images/sponsors/sida.png b/assets/static/images/sponsors/sida.png index bb620ee..f6a6802 100644 Binary files a/assets/static/images/sponsors/sida.png and b/assets/static/images/sponsors/sida.png differ diff --git a/content/about/sponsors/fastly/contents.lr b/content/about/sponsors/fastly/contents.lr index 46088f2..bbd1e20 100644 --- a/content/about/sponsors/fastly/contents.lr +++ b/content/about/sponsors/fastly/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Fastly --- -logo: /static/images/sponsors/fastly.svg +logo: /static/images/sponsors/fastly.png --- link: https://www.fastly.com/ --- diff --git a/content/about/sponsors/handshake/contents.lr b/content/about/sponsors/handshake/contents.lr index bb7f6fd..b39a8b8 100644 --- a/content/about/sponsors/handshake/contents.lr +++ b/content/about/sponsors/handshake/contents.lr @@ -6,7 +6,7 @@ time: 2010 - 2013, 2017 - 2020 --- name: The Handshake Foundation --- -logo: /static/images/sponsors/handshake.svg +logo: /static/images/sponsors/handshake.png --- link: https://handshake.org/ --- diff --git a/content/about/sponsors/mdf/contents.lr b/content/about/sponsors/mdf/contents.lr index bc64470..4eced17 100644 --- a/content/about/sponsors/mdf/contents.lr +++ b/content/about/sponsors/mdf/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Media Democracy Found --- -logo: /static/images/sponsors/mdf.jpg +logo: /static/images/sponsors/mdf.png --- link: http://mediademocracyfund.org/ --- diff --git a/content/about/sponsors/mozilla/contents.lr b/content/about/sponsors/mozilla/contents.lr index 48ff4f0..4f8fadc 100644 --- a/content/about/sponsors/mozilla/contents.lr +++ b/content/about/sponsors/mozilla/contents.lr @@ -6,7 +6,7 @@ time: 2016 - 2018 --- name: Mozilla --- -logo: /static/images/sponsors/mozilla.jpg +logo: /static/images/sponsors/mozilla.png --- link: https://www.mozilla.org/en-US/moss/ --- diff --git a/content/about/sponsors/otf/contents.lr b/content/about/sponsors/otf/contents.lr index ef21336..c1dbe2b 100644 --- a/content/about/sponsors/otf/contents.lr +++ b/content/about/sponsors/otf/contents.lr @@ -6,7 +6,7 @@ time: 2012 - 2019 --- name: Open Technology Fund --- -logo: /static/images/sponsors/OTF.jpg +logo: /static/images/sponsors/OTF.png --- link: https://www.opentech.fund/ --- diff --git a/templates/layout.html b/templates/layout.html index 53bf2b8..82e7e5f 100644 --- a/templates/layout.html +++ b/templates/layout.html @@ -14,7 +14,7 @@ <div class="container-fluid"> <div class="row flex-xl-nowrap"> <main role="main" class="mx-auto col-12 {{ bag('alternatives', this.alt, 'order') }}"> - <div class="container py-3 preamble"> + <div class="container py-3 mt-5 preamble"> {{ this.body }} </div> {% include this.html %} diff --git a/templates/macros/sponsors.html b/templates/macros/sponsors.html index f5d53dd..fd7d4a1 100644 --- a/templates/macros/sponsors.html +++ b/templates/macros/sponsors.html @@ -1,9 +1,11 @@ {% macro render_active(item, alternative) %} -<div class="card border-0 col-6"> +<div class="col-4"> +<div class="card border-1"> <img class="card-img-top" src="{{ item.logo|asseturl }}" alt="Card image cap"> <div class="card-body"> - <p class="text-primary description description-small"><u><a href="{{ item.link }}">{{ item.name }}</a></u></p> + <h4><a href="{{ item.link }}">{{ item.name }}</a></h4> <p class="card-text description description-small">{{ item.description }}</p> </div> </div> +</div> {% endmacro %} diff --git a/templates/sponsors.html b/templates/sponsors.html index 8bb08ba..228a582 100644 --- a/templates/sponsors.html +++ b/templates/sponsors.html @@ -1,20 +1,5 @@ <div class="container py-3"> - <h3 class="text-primary display-5">Past Sponsors</h3> -</div> -<div class="container"> - <div class="row"> - <div class="col-8"> - <ul class="jobs-ul"> - {% set items = this.children %} - {% for item in items.filter(F.active == False) %} - <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> - {% endfor %} - </ul> - </div> - </div> -</div> -<div class="container py-3"> - <h3 class="text-primary display-5">Active Sponsors</h3> +<h3 class="text-primary display-5">Active Sponsors</h3> </div> <div class="container"> <div class="row"> @@ -25,6 +10,21 @@ {% endfor %} </div> </div> +<div class="container py-3"> +<h3 class="text-primary display-5">Past Sponsors</h3> +</div> +<div class="container"> +<div class="row"> + <div class="col-8"> + <ul class="jobs-ul"> + {% set items = this.children %} + {% for item in items.filter(F.active == False) %} + <li><a href="{{ item.link}}">{{ item.name }}</a> - <span> {{ item.time }}</span></li> + {% endfor %} + </ul> + </div> +</div> +</div> <div class="container"> <div class="row"> <p>This sponsors page is based upon un-audited and un-reviewed financial and in-kind donations, contract, and other data. Further details about our audited and reviewed funding can be found on our Financial Reports page.</p>

1 0

[tpo/master] Merge pull request #2 from torproject/master
by hiro＠torproject.org 17 Jan '19

17 Jan '19

commit c023b91439374f8111c12a2d03578869a4f3b81a Merge: c34d50a 9c31480 Author: Antonela <hola(a)antonela.me> Date: Thu Jan 17 15:31:06 2019 -0300 Merge pull request #2 from torproject/master rebase templates/macros/people.html | 9 +-------- templates/sponsors.html | 47 -------------------------------------------- 2 files changed, 1 insertion(+), 55 deletions(-)

1 0

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

17 Jan '19

commit 464ceee336c8fa90a26d59bd48492df5f9e41a28 Author: Translation commit bot <translation(a)torproject.org> Date: Thu Jan 17 18:49:15 2019 +0000 Update translations for tpo-web --- contents+es.po | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/contents+es.po b/contents+es.po index b0776a54d..86a01bddf 100644 --- a/contents+es.po +++ b/contents+es.po @@ -146,7 +146,7 @@ msgstr "" #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.title) msgid "History" -msgstr "Historial" +msgstr "Historia" #: https//torproject.org/about/history/ #: (content/about/history/contents+en.lrpage.body)

1 0