Commit 78289a27 authored by Gus's avatar Gus 🍕
Browse files

Merge branch 'master' into develop

parents e13c3943 93bbb67a
Pipeline #9107 passed with stage
in 1 minute and 39 seconds
image: debian:buster-slim
cache:
key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
paths:
- packages
- lego
- apt-cache
# This template should be usable on any system that's based on apt.
# taken from tor gitlabci
.apt-template: &apt-template |
export LC_ALL=C.UTF-8
echo Etc/UTC > /etc/timezone
mkdir -p apt-cache
export APT_CACHE_DIR="$(pwd)/apt-cache"
echo 'quiet "1";' \
'APT::Install-Recommends "0";' \
'APT::Install-Suggests "0";' \
'APT::Acquire::Retries "20";' \
'APT::Get::Assume-Yes "true";' \
'Dpkg::Use-Pty "0";' \
"Dir::Cache::Archives \"${APT_CACHE_DIR}\"; " \
>> /etc/apt/apt.conf.d/99gitlab
apt-get update -qq
apt-get upgrade -qy
variables:
GIT_SUBMODULE_STRATEGY: recursive
before_script:
- *apt-template
- DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl python3-cryptography i18nspector -y
- pip3 install virtualenv
- virtualenv venv
- source venv/bin/activate
- pip3 install lektor
- echo 'checking out translations'
- rm -rf i18n
- git clone https://git.torproject.org/translation.git i18n
- cd i18n && git checkout tbmanual-contentspot && cd ..
- git clone https://gitlab.torproject.org/tpo/community/l10n.git
- pip3 install polib
pages:
script:
- echo 'building lektor 3 times to get translations in place'
- lektor plugins reinstall
- lektor build --output-path public && lektor build --output-path public && lektor build --output-path public
- echo 'lets see if there are any updates in the strings for translation'
- l10n/bin/check_po_status.py tbmanual-contentspot
artifacts:
paths:
- public
- i18n
only:
- master
check_l10n:
script:
- l10n/bin/check_markdown_links.py i18n/
......@@ -13,14 +13,14 @@ RewriteRule ^(en-US|en)$ / [R=302,L]
RewriteRule ^(en-US|en)/(.*) /$2 [R=302,L]
# Rewrites for languages that have a different mapping in the page
RewriteRule ^(es-ES|es-MX|es-CO)$ /es [R=302,L]
RewriteRule ^(es-ES|es-MX|es-CO)/(.*) /es/$2 [R=302,L]
RewriteRule ^(es-ES|es-MX|es-CO|es-AR)$ /es [R=302,L]
RewriteRule ^(es-ES|es-MX|es-CO|es-AR)/(.*) /es/$2 [R=302,L]
# Rewrites for languages that have a Tor Browser release
# but don't have a translated manual
# this languages are the priority for translation of the Tor Browser User Manual!
RewriteRule ^(cs|da|fa|hu|ja|ko|ms|nb-NO|nl|pl|sv-SE|vi|zh-TW)$ / [R=302,L]
RewriteRule ^(cs|da|fa|hu|ja|ko|ms|nb-NO|nl|pl|sv-SE|vi|zh-TW)/(.*) /$2 [R=302,L]
RewriteRule ^(cs|da|fa|hu|ja|ko|ms|my|nb-NO|nl|pl|sv-SE|vi|zh-TW)$ / [R=302,L]
RewriteRule ^(cs|da|fa|hu|ja|ko|ms|my|nb-NO|nl|pl|sv-SE|vi|zh-TW)/(.*) /$2 [R=302,L]
# we have only one translation for this locales
RewriteRule ^bn-(BD|IN)$ /bn [R=302,L]
......
......@@ -2,18 +2,21 @@ This the repository of the new Tor Browser manual maintained with lektor.
The current online version of the manual can be found at
- https://tb-manual.torproject.org
- http://dgvdmophvhunawds.onion/
- http://dsbqrprgkqqifztta6h3w7i2htjhnq7d3qkh3c7gvc35e66rrcv66did.onion/
To clone the code use either of
`git clone https://gitweb.torproject.org/project/web/manual.git/`
`torify git clone http://dccbbv6cooddgcrq.onion/project/web/manual.git/`
or browse it online: http://jqs44zhtxl2uo6gk.onion/project/web/manual.git
To clone the code use either one of these options:
* Local git:
- `git clone https://gitweb.torproject.org/project/web/manual.git`
- `torify git clone http://xtlfhaspqtkeeqxk6umggfbr3gyfznvf4jhrge2fujz53433i2fcs3id.onion/project/web/manual.git`
* Browse the online git:
- http://gzgme7ov25seqjbphab4fkcph3jkobfwwpivt5kzbv3kqx2y2qttl4yd.onion/project/web/manual.git
How to report bugs or feedback
==============================
Please file a [trac ticket](https://trac.torproject.org) and choose the component: Community/Tor Browser Manual
First, check if the bug is already known. You can search and read all the issues at https://gitlab.torproject.org/. To create a new issue, please [request a new account](https://gitlab.onionize.space/) to access Tor Project's GitLab instance and [find the right repository](https://gitlab.torproject.org/tpo) to report your issue. Issues related to our websites should be filed under the [Web issue tracker](https://gitlab.torproject.org/groups/tpo/web/-/issues).
What is Lektor?
===============
......
assets/static/images/circuit_full.png

38.1 KB | W: | H:

assets/static/images/circuit_full.png

50 KB | W: | H:

assets/static/images/circuit_full.png
assets/static/images/circuit_full.png
assets/static/images/circuit_full.png
assets/static/images/circuit_full.png
  • 2-up
  • Swipe
  • Onion skin
assets/static/images/new_identity.png

57.9 KB | W: | H:

assets/static/images/new_identity.png

98.6 KB | W: | H:

assets/static/images/new_identity.png
assets/static/images/new_identity.png
assets/static/images/new_identity.png
assets/static/images/new_identity.png
  • 2-up
  • Swipe
  • Onion skin
assets/static/images/security-settings-anim.gif

1.07 MB | W: | H:

assets/static/images/security-settings-anim.gif

579 KB | W: | H:

assets/static/images/security-settings-anim.gif
assets/static/images/security-settings-anim.gif
assets/static/images/security-settings-anim.gif
assets/static/images/security-settings-anim.gif
  • 2-up
  • Swipe
  • Onion skin
assets/static/images/security-settings-safest.png

133 KB | W: | H:

assets/static/images/security-settings-safest.png

76.7 KB | W: | H:

assets/static/images/security-settings-safest.png
assets/static/images/security-settings-safest.png
assets/static/images/security-settings-safest.png
assets/static/images/security-settings-safest.png
  • 2-up
  • Swipe
  • Onion skin
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment