commit a6080d65771fe3d697ec878bae5c336ddf52c93a Merge: 79be3c2 4a343b8 Author: hiro hiro@torproject.org Date: Thu Mar 14 15:24:46 2019 +0100

Merge branch 'staging'

configs/i18n.ini | 4 +-- content/about/contents.lr | 4 +-- content/about/history/contents.lr | 26 ++++++++++----- content/about/jobs/contents.lr | 2 +- content/about/people/biella-core/contents.lr | 2 +- content/about/people/contents.lr | 2 +- content/about/people/hellais/contents.lr | 2 +- content/about/people/robgjansen/contents.lr | 2 +- content/about/people/ssteele/contents.lr | 2 +- content/about/reports/contents.lr | 2 +- content/about/sponsors/contents.lr | 2 +- content/about/sponsors/google/contents.lr | 2 +- content/about/sponsors/mozilla/contents.lr | 3 +- content/about/sponsors/shinjiru/contents.lr | 2 +- content/about/sponsors/sida/contents.lr | 3 +- 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 +++-- 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+ru.ini | 1 + databags/about+tr.ini | 1 + databags/about+zh-CN.ini | 1 + databags/alternatives.ini | 48 ++++++++++++++++++++++++-- databags/download-alternatives.ini | 36 ++++++++++++++++++-- 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+ru.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+ru.ini | 1 + databags/menu_footer+tr.ini | 1 + databags/menu_footer+zh-CN.ini | 1 + templates/footer.html | 8 ++--- templates/macros/downloads.html | 2 +- templates/navbar.html | 2 +- templates/thank-you.html | 6 ++-- tpo.lektorproject | 50 +++++++++++++++++++++++++--- 58 files changed, 212 insertions(+), 161 deletions(-)