This is an automated email from the git hooks/post-receive script.
meskio pushed a commit to branch main in repository bridgedb.
commit c6af38a7adc9f2e92b2cc2120defed9db611a4a5 Merge: 3ab5afe 2d5b237 Author: meskio meskio@torproject.org AuthorDate: Wed Jul 27 20:31:48 2022 +0200
Merge remote-tracking branch 'gitlab/mr/31'
.gitmodules | 3 + bridgedb/distributors/https/server.py | 45 +- bridgedb/distributors/https/templates/bridges.html | 130 ----- bridgedb/distributors/https/templates/captcha.html | 49 -- bridgedb/distributors/https/templates/index.html | 71 --- bridgedb/distributors/https/templates/options.html | 174 ------- bridgedb/i18n/templates/bridgedb.pot | 534 ++++++++++----------- bridgedb/test/test_https.py | 11 +- bridgedb/test/test_https_server.py | 43 +- frontend/.gitignore | 93 ++++ frontend/assets/javascript | 1 + frontend/assets/scss/_alert.scss | 1 + frontend/assets/scss/_badge.scss | 1 + frontend/assets/scss/_breadcrumb.scss | 1 + frontend/assets/scss/_bridges.scss | 94 ++++ frontend/assets/scss/_button-group.scss | 1 + frontend/assets/scss/_buttons.scss | 1 + frontend/assets/scss/_card.scss | 1 + frontend/assets/scss/_carousel.scss | 1 + frontend/assets/scss/_close.scss | 1 + frontend/assets/scss/_code.scss | 1 + frontend/assets/scss/_component-examples.scss | 1 + frontend/assets/scss/_cryptocurrency.scss | 1 + frontend/assets/scss/_custom-forms.scss | 1 + frontend/assets/scss/_donate.scss | 1 + frontend/assets/scss/_dropdown.scss | 1 + frontend/assets/scss/_eoy.scss | 1 + frontend/assets/scss/_forms.scss | 1 + frontend/assets/scss/_functions.scss | 1 + frontend/assets/scss/_grid.scss | 1 + frontend/assets/scss/_icons.scss | 1 + frontend/assets/scss/_illos.scss | 1 + frontend/assets/scss/_images.scss | 1 + frontend/assets/scss/_input-group.scss | 1 + frontend/assets/scss/_jumbotron.scss | 1 + frontend/assets/scss/_list-group.scss | 1 + frontend/assets/scss/_media.scss | 1 + frontend/assets/scss/_mixins.scss | 1 + frontend/assets/scss/_modal.scss | 1 + frontend/assets/scss/_nav.scss | 1 + frontend/assets/scss/_navbar.scss | 1 + frontend/assets/scss/_newsletter.scss | 1 + frontend/assets/scss/_pagination.scss | 1 + frontend/assets/scss/_popover.scss | 1 + frontend/assets/scss/_portal.scss | 1 + frontend/assets/scss/_print.scss | 1 + frontend/assets/scss/_progress.scss | 1 + frontend/assets/scss/_reboot.scss | 1 + frontend/assets/scss/_root.scss | 1 + frontend/assets/scss/_sidebar.scss | 1 + frontend/assets/scss/_tables.scss | 1 + frontend/assets/scss/_tooltip.scss | 1 + frontend/assets/scss/_tor-variables.scss | 1 + frontend/assets/scss/_tor.scss | 1 + frontend/assets/scss/_tpo.scss | 1 + frontend/assets/scss/_transitions.scss | 1 + frontend/assets/scss/_type.scss | 1 + frontend/assets/scss/_utilities.scss | 1 + frontend/assets/scss/_variables.scss | 1 + frontend/assets/scss/bootstrap-grid.css | 1 + frontend/assets/scss/bootstrap-grid.css.map | 1 + frontend/assets/scss/bootstrap-grid.scss | 1 + frontend/assets/scss/bootstrap-reboot.scss | 1 + frontend/assets/scss/bootstrap.scss | 1 + frontend/assets/scss/mixins | 1 + frontend/assets/scss/utilities | 1 + frontend/assets/static/css | 1 + frontend/assets/static/fonts | 1 + frontend/assets/static/images/bridges-add.png | Bin 0 -> 17891 bytes frontend/assets/static/images/bridges-add.svg | 1 + frontend/assets/static/images/bridges-download.png | Bin 0 -> 18072 bytes frontend/assets/static/images/bridges-download.svg | 1 + frontend/assets/static/images/bridges-get.png | Bin 0 -> 30148 bytes frontend/assets/static/images/bridges-get.svg | 1 + frontend/assets/static/images/favicon.ico | Bin 0 -> 4286 bytes frontend/assets/static/images/favicon.png | Bin 0 -> 1184 bytes .../assets/static/images/placeholder_captcha.jpg | Bin 0 -> 64012 bytes frontend/assets/static/images/tor-logo@2x.png | Bin 0 -> 10042 bytes frontend/assets/static/js/bootstrap.bundle.min.js | 1 + .../assets/static}/js/bridges.js | 43 +- frontend/assets/static/js/download.js | 1 + frontend/assets/static/js/fallback.js | 1 + frontend/assets/static/js/jquery-3.2.1.min.js | 1 + frontend/assets/static/js/modernizr.js | 1 + frontend/assets/static/js/popper.min.js | 1 + frontend/assets/static/js/scrollspy.min.js | 1 + frontend/babel.cfg | 3 + frontend/bridges.lektorproject | 171 +++++++ frontend/build.sh | 44 ++ frontend/configs/i18n.ini | 5 + frontend/content/bridges/contents.lr | 15 + frontend/content/captcha/contents.lr | 15 + frontend/content/contents.lr | 17 + frontend/content/howto/contents.lr | 15 + frontend/content/options/contents.lr | 27 ++ frontend/databags/alternatives.ini | 71 +++ frontend/databags/alternatives.json | 13 + frontend/databags/menu.ini | 1 + frontend/databags/menu_footer.ini | 1 + frontend/lego | 1 + frontend/models/page.ini | 44 ++ frontend/packages | 1 + frontend/templates/advanced-options.html | 28 ++ frontend/templates/bridges.html | 83 ++++ frontend/templates/captcha.html | 20 + frontend/templates/footer.html | 127 +++++ frontend/templates/hero-home.html | 6 + frontend/templates/hero-options.html | 0 frontend/templates/hero.html | 7 + frontend/templates/home.html | 25 + frontend/templates/homepage.html | 49 ++ frontend/templates/howto.html | 11 + frontend/templates/jumbotron.html | 4 + frontend/templates/macros/footer.html | 3 + frontend/templates/meta.html | 31 ++ frontend/templates/navbar.html | 1 + frontend/templates/options.html | 42 ++ frontend/templates/support.jinja2 | 27 ++ requirements.txt | 24 + scripts/install-dependencies | 2 +- setup.py | 64 ++- 121 files changed, 1570 insertions(+), 785 deletions(-)
diff --cc bridgedb/i18n/templates/bridgedb.pot index 0994b57,e0df418..229661a --- a/bridgedb/i18n/templates/bridgedb.pot +++ b/bridgedb/i18n/templates/bridgedb.pot @@@ -1,18 -1,12 +1,12 @@@ - # Translations template for bridgedb. - # Copyright (C) 2020 'The Tor Project, Inc.' - # This file is distributed under the same license as the bridgedb project. - # - # Translators: - # FIRST AUTHOR EMAIL@ADDRESS, 2019-2020 - # runasand inactive+runasand@transifex.com, 2011 msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: \n" +"Project-Id-Version: Tor Project\n" - "Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&ke..." - "POT-Creation-Date: 2020-05-14 14:21-0700\n" - "PO-Revision-Date: 2020-05-15 08:24+0000\n" ++"Report-Msgid-Bugs-To: 'https://gitlab.torproject.org/tpo/anti-censorship/bridgedb%5Cn" + "POT-Creation-Date: 2022-02-10 12:46+PST\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME EMAIL@ADDRESS\n" -"Language-Team: en LL@li.org\n" ++"PO-Revision-Date: 2022-02-10 12:46+PST\n" +"Last-Translator: Transifex Bot <>\n" +"Language-Team: English (http://www.transifex.com/otf/torproject/language/en/)%5Cn" + "Language: en\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n"