[tor-commits] [community/staging] Merge branch 'staging' into 'master'

[pili@xxxxxxxxxxxxxx]

commit 3d12182fa8d082c2af62d223a0e9639430082d9a
Merge: cb6830c 01fb5c1
Author: Pili Guerra <pili@xxxxxxxxxxxxxx>
Date:   Thu May 30 15:13:23 2019 +0000

    Merge branch 'staging' into 'master'
    
    Update personal fork
    
    See merge request pili/community!1

 .htaccess                                          |   4 +
 assets/static/images/home/png/onion-services.png   | Bin 0 -> 164556 bytes
 assets/static/images/localization/stats.png        | Bin 0 -> 297298 bytes
 .../images/onion-services/onion-sites/Tor.svg      |  68 +++++++++++++
 .../images/onion-services/onion-sites/nyt.png      | Bin 0 -> 34530 bytes
 .../onion-services/onion-sites/propublica.svg      |   1 +
 .../overview/tor-onion-services-1.png              | Bin 0 -> 17222 bytes
 .../overview/tor-onion-services-2.png              | Bin 0 -> 19207 bytes
 .../overview/tor-onion-services-3.png              | Bin 0 -> 22213 bytes
 .../overview/tor-onion-services-4.png              | Bin 0 -> 21419 bytes
 .../overview/tor-onion-services-5.png              | Bin 0 -> 22165 bytes
 .../overview/tor-onion-services-6.png              | Bin 0 -> 18018 bytes
 community.lektorproject                            |  36 ++++++-
 configs/i18n.ini                                   |   4 +-
 .../becoming-tor-translator/contents.lr            |  59 ++++++-----
 content/localization/current-status/contents.lr    |   7 +-
 content/localization/pick-a-project/contents.lr    |  10 +-
 .../localization/translation-problem/contents.lr   |   2 +-
 content/onion-services/contents+es.lr              |  21 ----
 content/onion-services/contents+fr.lr              |  21 ----
 content/onion-services/onion-sites/nyt/contents.lr |  13 +++
 .../onion-sites/propublica/contents.lr             |  13 +++
 .../onion-sites/tor-project/contents.lr            |  15 +++
 content/onion-services/overview/contents.lr        | 112 +++++++++++++++++++++
 content/onion-services/setup/contents.lr           |  55 ++++++++++
 content/onion-services/ssl-tls/contents.lr         |   4 +
 content/outreach/contents+en.lr                    |  21 ----
 content/outreach/contents+es.lr                    |  21 ----
 content/outreach/contents+fr.lr                    |  21 ----
 content/relay-operations/contents.lr               |   2 +-
 content/training/contents+en.lr                    |  23 -----
 content/training/contents+es.lr                    |  23 -----
 content/training/contents+fr.lr                    |  23 -----
 content/training/contents.lr                       |   2 +-
 content/user-testing/contents+en.lr                |  23 -----
 content/user-testing/contents+es.lr                |  23 -----
 content/user-testing/contents+fr.lr                |  23 -----
 content/user-testing/contents.lr                   |   6 +-
 databags/alternatives.ini                          |  34 ++++++-
 databags/menu+ar.ini                               |  19 ++++
 databags/menu+bn-BD.ini                            |  19 ++++
 databags/menu+pt-BR.ini                            |  20 +++-
 databags/menu+tr.ini                               |  19 ++++
 databags/menu+zh-CN.ini                            |  19 ++++
 databags/menu_footer+ar.ini                        |  15 +++
 databags/menu_footer+bn-BD.ini                     |  15 +++
 databags/menu_footer+de.ini                        |  16 ++-
 databags/menu_footer+es.ini                        |  16 ++-
 databags/menu_footer+fr.ini                        |  16 ++-
 databags/menu_footer+pt-BR.ini                     |  16 ++-
 databags/menu_footer+tr.ini                        |  15 +++
 databags/menu_footer+zh-CN.ini                     |  15 +++
 databags/pagenav+ar.ini                            |  23 +++++
 databags/pagenav+bn-BD.ini                         |  23 +++++
 databags/pagenav+de.ini                            |  24 ++++-
 databags/pagenav+fr.ini                            |  24 ++++-
 databags/pagenav+pt-BR.ini                         |  24 ++++-
 databags/pagenav+tr.ini                            |  23 +++++
 databags/pagenav+zh-CN.ini                         |  23 +++++
 models/onion-sites.ini                             |  22 ++++
 templates/footer.html                              |   6 +-
 templates/layout.html                              |   2 +
 templates/navbar.html                              |   2 +-
 templates/onion-services.html                      |  42 ++++++--
 64 files changed, 843 insertions(+), 305 deletions(-)



_______________________________________________
tor-commits mailing list
tor-commits@xxxxxxxxxxxxxxxxxxxx
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits