[tor-commits] [translation-tools/master] Check for unescaped characters in fenix translations

[emmapeel]

commit f0160f12407cb019bbaf680c9aded208181281c2
Author: Nicolas Vigier 
Date:   Tue Feb 22 11:52:05 2022 +0100

Check for unescaped characters in fenix translations

For tor-browser#40367
---
 update_translations | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/update_translations b/update_translations
index ccec8fa..fbe3aef 100755
--- a/update_translations
+++ b/update_translations
@@ -19,6 +19,9 @@ echo ${PID} > ${PIDFILE}
 # Prepare the repository by making sure it is up to date.
 cd $TRANSLATION_REPO
 
+unescaped_files=$(mktemp)
+trap 'rm -f $unescaped_files' EXIT
+
 # For each project, fetch the new translations and commit
 # if there are any changes.
 
@@ -37,6 +40,17 @@ for project in $PROJECTS; do
   # Fetch new translations for this project ...
   $TX pull -a -s $TX_PULL_OPTS > /dev/null;
 
+  if test "$project" = "fenix-torbrowserstringsxml" || test "$project" = 
"fenix-torbrowserstringsxml_completed"
+  then
+find . -name '*.xml' -exec grep -H "[^\\]'" {} \; > "$unescaped_files"
+if ! test -z "$(cat $unescaped_files)"
+then
+  cat $unescaped_files | mail -s "Unescaped files in $project" 
emmap...@torproject.org bo...@torproject.org
+  cd ..
+  continue
+fi
+  fi
+
   # ... add them to git ...
   git add -A . > /dev/null;
   git commit -qm "new translations in $project" > /dev/null || test $? = 1;

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

[tor-commits] [translation/tpo-web] fixed wrong branch name

[emmapeel]

commit 861441db7d5fa471b8a599133712985365c4501b
Author: emma peel 
Date:   Wed Feb 16 11:55:16 2022 +

fixed wrong branch name
---
 .gitlab-ci.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 25b885a4e8..d8bab3ae21 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
 variables:
-  TRANSLATION_BRANCH : "gettor-website-contentspot"
-  LEKTOR_PROJECT: tpo/web/gettor-web
+  TRANSLATION_BRANCH : "tpo-web"
+  LEKTOR_PROJECT: tpo/web/tpo
 
 include:
   - project: tpo/tpa/ci-templates

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

[tor-commits] [translation/tbmanual-contentspot] add translation file to this repo instead of tpo/web. ref: tpo/web/team#26

[emmapeel]

eedback
+
+
+https://about.gitlab.com/contributing;>Contribute to GitLab
+
+
+
+
+
+
+
+
+
+Sign in
+
+
+
+
+
+
+Toggle navigation
+
+Menu
+
+
+
+
+
+
+
+
+
+
+
+
+
+M
+
+
+manual
+
+
+
+
+
+
+Project information
+
+
+
+
+Project information
+
+
+
+
+Activity
+
+
+Labels
+
+
+Members
+
+
+
+
+
+
+
+
+Repository
+
+
+
+
+Repository
+
+
+
+
+Files
+
+
+Commits
+
+
+Branches
+
+
+Tags
+
+
+Contributors
+
+
+Graph
+
+
+Compare
+
+
+
+
+
+
+
+
+Issues
+
+17
+
+
+
+Issues
+
+
+17
+
+
+
+
+List
+
+
+Boards
+
+
+Service Desk
+
+
+Milestones
+
+
+
+
+
+
+
+
+Merge requests
+
+1
+
+
+
+Merge requests
+
+
+1
+
+
+
+
+
+
+
+
+CI/CD
+
+
+
+
+CI/CD
+
+
+
+
+Pipelines
+
+
+Jobs
+
+
+Schedules
+
+
+
+
+
+
+
+
+Deployments
+
+
+
+
+Deployments
+
+
+
+
+Environments
+
+
+Releases
+
+
+
+
+
+
+
+
+Monitor
+
+
+
+
+Monitor
+
+
+
+
+Incidents
+
+
+
+
+
+
+
+
+Analytics
+
+
+
+
+Analytics
+
+
+
+
+Value stream
+
+
+CI/CD
+
+
+Repository
+
+
+
+
+
+
+
+
+Snippets
+
+
+
+
+Snippets
+
+
+
+
+
+
+Activity
+
+
+Graph
+
+
+Create a new issue
+
+
+Jobs
+
+
+Commits
+
+
+Issue Boards
+
+
+
+
+
+Collapse sidebar
+
+
+Close sidebar
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Open 
sidebar
+
+
+
+The Tor ProjectWeb
 manual
+
+
+
+Jobs
+
+
+
+
+
+{"@context":"<a  rel="nofollow" href="https://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"name":"The">https://schema.org","@type":"BreadcrumbList","itemListElement":[{"@type":"ListItem","position":1,"name":"The</a>
 Tor 
Project","item":"<a  rel="nofollow" href="https://gitlab.torproject.org/tpo"},{"@type":"ListItem","position":2,"name":"Web","item":"https://gitlab.torproject.org/tpo/web"},{"@type":"ListItem","position":3,"name":"manual","item":"https://gitlab.torproject.org/tpo/web/manual"},{"@type":"ListItem","position":4,"name":"Jobs","item":"https://gitlab.torproject.org/tpo/web/manual/-/jobs/93383/artifacts/file/i18n/contents.pot"}]}">https://gitlab.torproject.org/tpo"},{"@type":"ListItem","position":2,"name":"Web","item":"https://gitlab.torproject.org/tpo/web"},{"@type":"ListItem","position":3,"name":"manual","item":"https://gitlab.torproject.org/tpo/web/manual"},{"@type":"ListItem","position":4,"name":"Jobs","item":"https://gitlab.torproject.org/tpo/web/manual/-/jobs/93383/artifacts/file/i18n/contents.pot"}]}</a>
+
+
+
+
+
+
+
+
+http://schema.org/SoftwareSourceCode;>
+
+
+
+
+
+
+
+
+passed
+
+
+
+Job
+#93383
+
+in pipeline
+
+#26583
+
+for
+
+4ccf6701
+
+from
+
+main
+
+by
+
+
+
+
+emmapeel
+
+
+@emmapeel
+
+
+Feb 08, 2022
+
+
+
+
+
+
+
+Artifacts
+
+
+
+
+
+
+
+
+contents.pot
+
+
+
+118 KB
+
+
+
+
+
+
+
+
+
+
+
+The source could not be displayed because it is stored as a job artifact.
+You can
+download 
it
+instead.
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+//<![CDATA[
+if ('loading' in HTMLImageElement.prototype) {
+  document.querySelectorAll('img.lazy').forEach(img => {
+img.loading = 'lazy';
+let imgUrl = img.dataset.src;
+// Only adding width + height for avatars for now
+if (imgUrl.indexOf('/avatar/') > -1 && imgUrl.indexOf('?') === -1) {
+  const targetWidth = img.getAttribute('width') || img.width;
+  imgUrl += `?width=${targetWidth}`;
+}
+img.src = imgUrl;
+img.removeAttribute('data-src');
+img.classList.remove('lazy');
+img.classList.add('js-lazy-loaded', 'qa-js-lazy-loaded');
+  });
+}
+
+//]]>
+
+
+//<![CDATA[
+gl = window.gl || {};
+gl.experiments = {};
+
+
+//]]>
+
+
+
+
+

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

[tor-commits] [translation/gettor-website-contentspot] add translation file to this repo instead of tpo/web. ref: tpo/web/team#26

[emmapeel]

commit 13092921fab9dc7bc04b8df7f2d253cefa3b4330
Author: emma peel 
Date:   Fri Feb 11 14:40:55 2022 +

add translation file to this repo instead of tpo/web. ref: tpo/web/team#26
---
 src/contents.pot | 334 +++
 1 file changed, 334 insertions(+)

diff --git a/src/contents.pot b/src/contents.pot
new file mode 100644
index 00..67c6d78b1a
--- /dev/null
+++ b/src/contents.pot
@@ -0,0 +1,334 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2022-02-08 05:48+UTC\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME \n"
+"Language-Team: en \n"
+"Language: en\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: (dynamic)
+msgid "Tor Project"
+msgstr ""
+
+#: (dynamic)
+msgid "Donate"
+msgstr ""
+
+#: (dynamic)
+msgid "Donate Now"
+msgstr ""
+
+#: (dynamic)
+msgid "Menu"
+msgstr ""
+
+#: (dynamic)
+msgid "About"
+msgstr ""
+
+#: (dynamic)
+msgid "Support"
+msgstr ""
+
+#: (dynamic)
+msgid "Community"
+msgstr ""
+
+#: (dynamic)
+msgid "Blog"
+msgstr ""
+
+#: (dynamic)
+msgid "Documentation"
+msgstr ""
+
+#: (dynamic)
+msgid "PrivChat"
+msgstr ""
+
+#: (dynamic)
+msgid "Jobs"
+msgstr ""
+
+#: (dynamic)
+msgid "Contact"
+msgstr ""
+
+#: (dynamic)
+msgid "Press"
+msgstr ""
+
+#: (dynamic)
+msgid "Download Tor Browser"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+msgstr ""
+
+#: (dynamic)
+msgid "Our mission:"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"To advance human rights and freedoms by creating and deploying free and open "
+"source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+msgstr ""
+
+#: (dynamic)
+msgid "Subscribe to our Newsletter"
+msgstr ""
+
+#: (dynamic)
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
+
+#: (dynamic)
+msgid "Sign up"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"Trademark, copyright notices, and rules for use by third parties can be "
+"found in our %(link_to_faq)s"
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.title)
+msgid "What is GetTor?"
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"GetTor is a service that provides alternative methods to download the Tor "
+"Browser, especially for people living in places with high levels of "
+"censorship, where access to Tor Project's website is restricted."
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid "# How does it work?"
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid "The idea behind GetTor is very simple:"
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"- Step 1: Send a request to GetTor (get...@torproject.org) specifying your "
+"operating system (and your locale). Ex: \"windows es\""
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"- Step 2: GetTor will send you back a reply with links to download Tor "
+"Browser from our supported providers."
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"- Step 3: Download Tor Browser from one of the providers. When done, check "
+"the integrity of the downloaded file by verifying its signature."
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid "- Step 4: If required, get some bridges!"
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid "## GetTor Responder on Twitter"
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid "GetTor is currently not working on Twitter."
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid "## How to verify a digital signature"
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"Digital signature is a process ensuring that a certain package was generated "
+"by its developers and has not been tampered with."
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"In GetTor emails we provide a link to a file with the same name as the "
+"package and the extension \".asc\". These .asc files are OpenPGP signatures."
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"They allow you to verify the file you've downloaded is exactly the one that "
+"we intended you to get."
+msgstr ""
+
+#: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"For example, `torbrowser-install-win64-8.5.4_en-US.exe` is accompanied by "

[tor-commits] [translation/tpo-web] add new l10n stating. ref: tpo/community/l10n#40049

[emmapeel]

commit 92c6d3c96a12bcaf73dd5461520589edceef898c
Author: emma peel 
Date:   Thu Feb 10 16:31:44 2022 +

add new l10n stating. ref: tpo/community/l10n#40049
---
 .gitlab-ci.yml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 059611b1d2..25b885a4e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
-variables:  
-  TRANSLATION_BRANCH : "tpo-web"
-
-include:
-  project: tpo/community/l10n
-  file: ci-templates/lektor-with-more-langs.yml
+variables:
+  TRANSLATION_BRANCH : "gettor-website-contentspot"
+  LEKTOR_PROJECT: tpo/web/gettor-web
+
+include:
+  - project: tpo/tpa/ci-templates
+file: lektor-l10n-staging-trigger.yml

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

[tor-commits] [translation/gettor-website-contentspot] add previews. ref: tpo/community/l10n#40049

[emmapeel]

commit 470d20f582cdeb8ce778527fc65aaa7a3ac26571
Author: emma peel 
Date:   Thu Feb 3 11:27:43 2022 +

add previews. ref: tpo/community/l10n#40049
---
 .gitlab-ci.yml | 11 ++-
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fbb08023d3..25b885a4e8 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
-variables:  
+variables:
   TRANSLATION_BRANCH : "gettor-website-contentspot"
-
-include:
-  project: tpo/community/l10n
-  file: ci-templates/lektor-with-more-langs.yml
+  LEKTOR_PROJECT: tpo/web/gettor-web
+
+include:
+  - project: tpo/tpa/ci-templates
+file: lektor-l10n-staging-trigger.yml

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

[tor-commits] [translation/gettor-website-contentspot] add previews. ref: tpo/community/l10n#40049

[emmapeel]

commit 075f436a5dc102c89ed64efb66d7157bd792dd7c
Author: emma peel 
Date:   Thu Feb 3 11:22:26 2022 +

add previews. ref: tpo/community/l10n#40049
---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1019f468db..fbb08023d3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:  
-  TRANSLATION_BRANCH : "gettor-website-contentspot"   
+  TRANSLATION_BRANCH : "gettor-website-contentspot"
 
 include:
   project: tpo/community/l10n

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

[tor-commits] [translation/communitytpo-contentspot] new staging, ref: tpo/community/l10n#40049

[emmapeel]

commit e8d1085b706a0db40cb9ab1de3018fba76e67e58
Author: emma peel 
Date:   Mon Jan 31 17:05:36 2022 +

new staging, ref: tpo/community/l10n#40049
---
 .gitlab-ci.yml | 12 +++-
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 462bcdd74b..68d34de398 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
-variables:  
+variables:
   TRANSLATION_BRANCH : "communitytpo-contentspot"
-
-include:
-  project: tpo/community/l10n
-  file: ci-templates/lektor-with-more-langs.yml
+  LEKTOR_PROJECT: tpo/web/community
+
+include:
+  - project: tpo/tpa/ci-templates
+file: lektor-l10n-staging-trigger.yml
+

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

[tor-commits] [translation/tbmanual-contentspot] new staging, ref: tpo/community/l10n#40049

[emmapeel]

commit e12fb4a3a92d414e50793672b584e4b7cfe1e7da
Author: emma peel 
Date:   Mon Jan 31 17:01:48 2022 +

new staging, ref: tpo/community/l10n#40049
---
 .gitlab-ci.yml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4176f818e6..a9d8ecb6e2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,7 @@
-variables:  
-  TRANSLATION_BRANCH : "tbmanual-contentspot"   
-
-include:
-  project: tpo/community/l10n
-  file: ci-templates/lektor-with-more-langs.yml
+variables:
+  TRANSLATION_BRANCH : "tbmanual-contentspot"
+  LEKTOR_PROJECT: tpo/web/manual
+
+include:
+  - project: tpo/tpa/ci-templates
+file: lektor-l10n-staging-trigger.yml

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

[tor-commits] [translation/support-portal] new staging, ref: tpo/community/l10n#40049

[emmapeel]

commit 3a4fda302c9f0b0ebb0893aca5edbb1e53670c15
Author: emma peel 
Date:   Mon Jan 31 16:26:07 2022 +

new staging, ref: tpo/community/l10n#40049
---
 .gitlab-ci.yml | 14 --
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 10ea31cf4d..9f23ae5a53 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,8 @@
-variables:  
-  TRANSLATION_BRANCH : "support-portal"   
-
-include:
-  project: tpo/community/l10n
-  file: ci-templates/lektor-with-more-langs.yml
+variables:
+  TRANSLATION_BRANCH : "support-portal"
+  LEKTOR_PROJECT: tpo/web/support
+
+include:
+  - project: tpo/tpa/ci-templates
+file: lektor-l10n-staging-trigger.yml
+

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

[tor-commits] [translation-tools/master] update commit message, now kgb bot gives its own link

[emmapeel]

commit 97eaa04d7416366c953dc1de19652e4f86be897f
Author: emma peel 
Date:   Wed Nov 10 10:58:35 2021 +

update commit message, now kgb bot gives its own link
---
 update_translations | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update_translations b/update_translations
index b2d689c..ccec8fa 100755
--- a/update_translations
+++ b/update_translations
@@ -39,7 +39,7 @@ for project in $PROJECTS; do
 
   # ... add them to git ...
   git add -A . > /dev/null;
-  git commit -qm 
"https://gitweb.torproject.org/translation.git/commit/?h=$project; > /dev/null 
|| test $? = 1;
+  git commit -qm "new translations in $project" > /dev/null || test $? = 1;
 
   # ... and push them live.
   git push -q origin $project > /dev/null;

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

[tor-commits] [tpo/master] if this is picked up by lektor well, we have fixed https://gitlab.torproject.org/tpo/tpa/ci-templates/-/issues/5

[emmapeel]

commit 7c57f9c943797c45ad6c5eac7953ff545667c01b
Author: emma peel 
Date:   Thu Nov 4 14:42:34 2021 +0100

if this is picked up by lektor well, we have fixed 
https://gitlab.torproject.org/tpo/tpa/ci-templates/-/issues/5
---
 .htaccess => assets/.htaccess | 0
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/.htaccess b/assets/.htaccess
similarity index 100%
rename from .htaccess
rename to assets/.htaccess

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

[tor-commits] [tpo/master] unify gitlabci with translated lektorz

[emmapeel]

commit 7c415428d0d90de45e866b36a80180968cbfc190
Author: emmapeel 
Date:   Wed Nov 3 16:23:54 2021 +

unify gitlabci with translated lektorz
---
 .gitlab-ci.yml | 113 ++---
 1 file changed, 3 insertions(+), 110 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e64f0631..76fd66e0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,113 +1,6 @@
-image: debian:buster-slim
-
-
-# This template should be usable on any system that's based on apt.
-# taken from tor gitlabci
-
-.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
-  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
   TRANSLATION_BRANCH: "tpo-web"
 
-
-stages:
-- build
-- test_l10n
-
-pages:
-  cache:
-key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
-paths:
-  - packages
-  - lego
-  - apt-cache
-  - venv
-  - .cache/pip
-  - .cache/lektor/builds/
-  stage: build
-  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 apt-utils ca-certificates -y
-- pip3 install virtualenv
-- virtualenv venv
-- source venv/bin/activate
-- pip3 install lektor
-- echo 'checking out translations'
-- rm -rf i18n
-- git clone --branch $TRANSLATION_BRANCH 
https://git.torproject.org/translation.git i18n
-- echo 'reinstall lektor plugins'
-- lektor project-info --output-path
-- lektor plugins reinstall
-- echo 'building lektor 3 more times to get translations in place'
-- lektor build --output-path public && lektor build --output-path public 
&& lektor build --output-path public
-  artifacts:
-paths:
-  - public
-  - i18n
-  rules:
-- when: always
-
-check_new_strings:
-  cache:
-key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
-paths:
-  - packages
-  - lego
-  - apt-cache
-  - venv
-  - .cache/pip
-
-  stage: test_l10n
-  needs: [pages]
-  allow_failure: true
-  rules:
-- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-  script:
-- *apt-template
-- DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y
-- git clone https://gitlab.torproject.org/tpo/community/l10n.git
-- echo 'lets see if there are any updates in the strings for translation'
-- l10n/bin/check_po_status.py $TRANSLATION_BRANCH
-  artifacts:
-paths:
-  - public
-  - i18n
-  - l10n
-
-check_l10n:
-  allow_failure: true
-  cache:
-key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
-paths:
-  - packages
-  - lego
-  - apt-cache
-  - venv
-  - i18n
-  - .cache/pip
-  stage: test_l10n
-  needs: [pages]
-  only:
-- translations
-  script:
-- DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector 
python3-polib ca-certificates -y
-- echo 'lets see if there are any broken links on the translations'
-- l10n/bin/check_markdown_links.py i18n/
-
+include:
+  project: tpo/tpa/ci-templates
+  file: lektor.yml



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

[tor-commits] [tpo/master] remove duplicates

[emmapeel]

commit b81d4f3e670582e0f8c06b6b80ca2aec8a7b5393
Author: emma peel 
Date:   Wed Nov 3 19:50:41 2021 +0100

remove duplicates
---
 .gitlab-ci.yml | 4 
 1 file changed, 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0c9eca00..b88b6287 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,6 @@
 variables:
   TRANSLATION_BRANCH: "tpo-web"
 
-include:
-  project: tpo/tpa/ci-templates
-  file: lektor.yml
-
 include:
   - project: tpo/tpa/ci-templates
 file: lektor.yml



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

[tor-commits] [tpo/master] see https://gitlab.torproject.org/tpo/tpa/team/-/issues/40461

[emmapeel]

commit d8acfaa1c6219e9f1e154721e5788d0fc140bbfc
Author: emma peel 
Date:   Wed Nov 3 19:49:58 2021 +0100

see https://gitlab.torproject.org/tpo/tpa/team/-/issues/40461
---
 .gitlab-ci.yml | 6 ++
 lego   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 76fd66e0..0c9eca00 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -4,3 +4,9 @@ variables:
 include:
   project: tpo/tpa/ci-templates
   file: lektor.yml
+
+include:
+  - project: tpo/tpa/ci-templates
+file: lektor.yml
+  - project: tpo/tpa/ci-templates
+file: static-shim-deploy.yml
diff --git a/lego b/lego
index 637cc6c7..0d9efebb 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 637cc6c7d5997334be6c0ef7dc63500919ae7e22
+Subproject commit 0d9efebbaec064730fba8438dda2d666585247a0



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

[tor-commits] [manual/master] i have splitted the job in two now

[emmapeel]

commit a733b6e3291106289935699c5b198406161df48a
Author: emma peel 
Date:   Tue Nov 2 21:42:35 2021 +0100

i have splitted the job in two now
---
 .gitlab-ci.yml | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index de48258..8d56434 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -128,8 +128,10 @@ l10n_QA:
 - echo '==START Translations QA=='
 - rm -rf l10n
 - git clone --depth=1 https://gitlab.torproject.org/tpo/community/l10n.git
-- echo 'lets see if there are any BROKEN LINKS on the translations'
-- l10n/bin/check_markdown_links.py i18n/
+- echo 'lets see if there are any problems with the translations'
+- l10n/bin/check_common_errors.py i18n/
+- echo 'Enabled translations and their completion'
+- l10n/bin/check_completion.py
 
 build_tests_page:
   stage: test_l10n

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

[tor-commits] [manual/master] less build time, we dont need to build the l10n tests page so much

[emmapeel]

commit 32825581f058f61687269ae3c2f9580cf6215ad8
Author: emma peel 
Date:   Tue Nov 2 21:41:18 2021 +0100

less build time, we dont need to build the l10n tests page so much
---
 .gitlab-ci.yml | 21 -
 1 file changed, 12 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index c62b4b9..35e1548 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -58,16 +58,15 @@ pages:
   stage: build
   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 apt-utils ca-certificates -y
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel 
python3-pip  python3-inifile python3-dev python3-setuptools python3-openssl 
python3-cryptography -y
 - pip3 install virtualenv
 - virtualenv venv
 - source venv/bin/activate
 - pip3 install lektor
 - echo 'checking out translations'
 - rm -rf i18n
-- git clone --branch $TRANSLATION_BRANCH 
https://git.torproject.org/translation.git i18n
+- git clone --branch $TRANSLATION_BRANCH --depth=1 
https://git.torproject.org/translation.git i18n
 - echo 'reinstall lektor plugins'
-- lektor project-info --output-path
 - lektor plugins reinstall
 - echo 'building lektor 3 more times to get translations in place'
 - lektor build --output-path public && lektor build --output-path public 
&& lektor build --output-path public
@@ -76,7 +75,10 @@ pages:
   - public
   - i18n
   rules:
-- when: always
+- if: $TRANSLATION_BRANCH
+- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+- if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+  when: never
 
 new_strings:
   cache:
@@ -87,17 +89,18 @@ new_strings:
   - apt-cache
   - venv
   - .cache/pip
-
   stage: test_l10n
   needs: [pages]
   allow_failure: true
   rules:
 - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
 - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
-
+- if: '$CI_COMMIT_BRANCH == "translations"'
+- if: '$CI_COMMIT_BRANCH && $CI_OPEN_MERGE_REQUESTS'
+  when: never
   script:
 - *apt-template
-- DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext  python3-dev 
python3-setuptools i18nspector python3-polib python3-requests -y
 - git clone --depth=1 https://gitlab.torproject.org/tpo/community/l10n.git
 - echo 'lets see if there are any UPDATES ON THE STRINGS for translation 
after this changes'
 - l10n/bin/check_po_status.py $TRANSLATION_BRANCH
@@ -123,7 +126,8 @@ l10n_QA:
 - translations
   script:
 - *apt-template
-- DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector 
python3-polib ca-certificates -y
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-polib -y
+- echo '==START Translations QA=='
 - rm -rf l10n
 - git clone --depth=1 https://gitlab.torproject.org/tpo/community/l10n.git
 - echo 'lets see if there are any BROKEN LINKS on the translations'
@@ -135,5 +139,4 @@ build_tests_page:
   trigger: tpo/community/l10n
   rules:
 - changes:
-  - content/**/*.lr
   - i18n/contents.pot



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

[tor-commits] [manual/master] just move it to after the other test, is not urgent

[emmapeel]

commit f657e4e9be35089eca8b610ac5e6c0e4539e2906
Author: emma peel 
Date:   Tue Nov 2 21:42:13 2021 +0100

just move it to after the other test, is not urgent
---
 .gitlab-ci.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 35e1548..de48258 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -121,9 +121,7 @@ l10n_QA:
   - i18n
   - .cache/pip
   stage: test_l10n
-  needs: [pages]
-  only:
-- translations
+  needs: [new_strings]
   script:
 - *apt-template
 - DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-polib -y



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

[tor-commits] [manual/master] with this, we can use the same file through all lektors with translation

[emmapeel]

commit fb50f6d7f95f525dca51a53304325980f64774e8
Author: emma peel 
Date:   Tue Nov 2 21:03:28 2021 +0100

with this, we can use the same file through all lektors with translation
---
 .gitlab-ci.yml | 16 +++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4e7a6b2..34b0934 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -24,7 +24,21 @@ image: debian:buster-slim
 variables:
   GIT_SUBMODULE_STRATEGY: recursive
   PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
-  TRANSLATION_BRANCH: "tbmanual-contentspot"
+
+workflow:
+  rules:
+- if: $CI_PROJECT_NAME == "support"
+  variables:
+TRANSLATION_BRANCH: "support-portal"
+- if: $CI_PROJECT_NAME == "manual"
+  variables:
+TRANSLATION_BRANCH: "tbmanual-contentspot"
+- if: $CI_PROJECT_NAME == "community"
+  variables:
+TRANSLATION_BRANCH: "communitytpo-contentspot"
+- if: $CI_PROJECT_NAME == "tpo"
+  variables:
+TRANSLATION_BRANCH: "tpo-web"
 
 
 stages:



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

[tor-commits] [manual/master] better names for the tests

[emmapeel]

commit a152efc0947ea8e3863552d211e328eeb1e2cb19
Author: emma peel 
Date:   Tue Nov 2 21:04:40 2021 +0100

better names for the tests
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 34b0934..c62b4b9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,7 +78,7 @@ pages:
   rules:
 - when: always
 
-check_new_strings:
+new_strings:
   cache:
 key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
 paths:
@@ -106,7 +106,7 @@ check_new_strings:
   - public
   - i18n
 
-check_l10n:
+l10n_QA:
   allow_failure: true
   cache:
 key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
@@ -129,7 +129,7 @@ check_l10n:
 - echo 'lets see if there are any BROKEN LINKS on the translations'
 - l10n/bin/check_markdown_links.py i18n/
 
-translation_tests_page:
+build_tests_page:
   stage: test_l10n
   allow_failure: true
   trigger: tpo/community/l10n



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

[tor-commits] [manual/master] we need non-interactive apt, we were getting errors

[emmapeel]

commit dde82d0d47ee06f3aed094320d757c671468ae3a
Author: emma peel 
Date:   Tue Nov 2 21:02:18 2021 +0100

we need non-interactive apt, we were getting errors
---
 .gitlab-ci.yml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 272e6da..4e7a6b2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -17,8 +17,9 @@ image: debian:buster-slim
'Dpkg::Use-Pty "0";' \
"Dir::Cache::Archives \"${APT_CACHE_DIR}\"; " \
 >> /etc/apt/apt.conf.d/99gitlab
-  apt-get update -qq
-  apt-get upgrade -qy
+  DEBIAN_FRONTEND=noninteractive apt-get update -qq
+  DEBIAN_FRONTEND=noninteractive apt-get upgrade -qy
+  DEBIAN_FRONTEND=noninteractive apt-get install git apt-utils 
ca-certificates -y
 
 variables:
   GIT_SUBMODULE_STRATEGY: recursive



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

[tor-commits] [manual/translations] translation updates

[emmapeel]

commit e80daf4dac0d8ad2e61c7495d7c9d627f888a6d0
Author: emma peel 
Date:   Mon Nov 1 21:35:27 2021 +0100

translation updates
---
 i18n/contents.pot | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 3d0f2d3..dfcf0a3 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-30 09:08+CET\n"
+"POT-Creation-Date: 2021-11-01 21:33+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -2268,7 +2268,7 @@ msgstr ""
 #: https://tb-manual.torproject.org/uninstalling/
 #: (content/uninstalling/contents+en.lr:topic.body)
 msgid ""
-"*  Then type \"~/Library/Application Support/\" in the window and click Go."
+"* Then type `~/Library/Application Support/` in the window and click Go."
 msgstr ""
 
 #: https://tb-manual.torproject.org/uninstalling/

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

[tor-commits] [manual/translations] content updates

[emmapeel]

commit bf2aba34f83656b94a7bbc712e804a0cbbe4ae85
Author: emma peel 
Date:   Mon Nov 1 21:29:05 2021 +0100

content updates
---
 content/uninstalling/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/uninstalling/contents.lr b/content/uninstalling/contents.lr
index 05a8e2a..a3452be 100644
--- a/content/uninstalling/contents.lr
+++ b/content/uninstalling/contents.lr
@@ -24,7 +24,7 @@ On macOS:
 
 
 
-*  Then type "~/Library/Application Support/" in the window and click Go.
+* Then type `~/Library/Application Support/` in the window and click Go.
 
 
 



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

[tor-commits] [manual/master] smaller pulls

[emmapeel]

commit 5b293a10d6230f9ddc9d2e8158831fddfeb15578
Author: emma peel 
Date:   Mon Nov 1 21:03:35 2021 +0100

smaller pulls
---
 .gitlab-ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ef3b012..272e6da 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,14 +83,13 @@ check_new_strings:
   script:
 - *apt-template
 - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y
-- git clone https://gitlab.torproject.org/tpo/community/l10n.git
+- git clone --depth=1 https://gitlab.torproject.org/tpo/community/l10n.git
 - echo 'lets see if there are any UPDATES ON THE STRINGS for translation 
after this changes'
 - l10n/bin/check_po_status.py $TRANSLATION_BRANCH
   artifacts:
 paths:
   - public
   - i18n
-  - l10n
 
 check_l10n:
   allow_failure: true
@@ -108,9 +107,10 @@ check_l10n:
   only:
 - translations
   script:
+- *apt-template
 - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector 
python3-polib ca-certificates -y
 - rm -rf l10n
-- git clone https://gitlab.torproject.org/tpo/community/l10n.git
+- git clone --depth=1 https://gitlab.torproject.org/tpo/community/l10n.git
 - echo 'lets see if there are any BROKEN LINKS on the translations'
 - l10n/bin/check_markdown_links.py i18n/
 

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

[tor-commits] [manual/master] trigger build of https://tpo.pages.torproject.net/community/l10n/ when changes in content

[emmapeel]

commit 5c7d18bc5a5e5cda25d3f4dc1da47c80e6bd0494
Author: emma peel 
Date:   Mon Nov 1 18:51:04 2021 +0100

trigger build of https://tpo.pages.torproject.net/community/l10n/ when 
changes in content
---
 .gitlab-ci.yml | 9 +
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea4f9e7..ef3b012 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -113,3 +113,12 @@ check_l10n:
 - git clone https://gitlab.torproject.org/tpo/community/l10n.git
 - echo 'lets see if there are any BROKEN LINKS on the translations'
 - l10n/bin/check_markdown_links.py i18n/
+
+translation_tests_page:
+  stage: test_l10n
+  allow_failure: true
+  trigger: tpo/community/l10n
+  rules:
+- changes:
+  - content/**/*.lr
+  - i18n/contents.pot



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

[tor-commits] [community/master] first version hangout page

[emmapeel]

commit 4547393e19488f5a3640a9f543e3b32ed628a634
Author: emma peel 
Date:   Wed Oct 20 20:47:36 2021 +0200

first version hangout page
---
 content/localization/hangouts/contents.lr | 35 +++
 1 file changed, 35 insertions(+)

diff --git a/content/localization/hangouts/contents.lr 
b/content/localization/hangouts/contents.lr
new file mode 100644
index 000..81b0639
--- /dev/null
+++ b/content/localization/hangouts/contents.lr
@@ -0,0 +1,35 @@
+section: localization
+---
+section_id: localization
+---
+color: primary
+---
+_template: layout.html
+---
+title: Monthly Localization Hangouts
+---
+subtitle: Every 3rd Friday of the month the Tor L10n Team meets to translate 
together, share tricks, meet fellow translators, and find out about the l10n 
priorities for the Tor Project.
+---
+key: 2
+---
+html: two-columns-page.html
+---
+body:
+Every 3rd Friday of the month the Tor L10n Team meets to translate together, 
share tricks, have fun while translating, meet fellow translators, and find out 
about the l10n priorities for the Tor Project.
+
+Come join us on the Localization Hangout, from Noon UTC, on the [#tor-l10n 
channel in OFTC](https://support.torproject.org/get-in-touch/#irc-help). (you 
can also use Element  to connect: #tor-l10n:matrix.org)
+
+At 13 UTC we make a call on [Big Blue 
Button](https://tor.meet.coop/emm-qmu-8o2-d2w)
+
+If you are not a translator yet, you still have time to [become 
one](../becoming-tor-translator/) before the hangout.
+
+![person hanging out](/static/images/home/png/block-trackers.png)
+
+### What do we do in a hangout?
+
+- Translate stuff
+- Share translation tips and resources
+- Complain about developers
+- Talk about translation priorities
+- Talk about our local contexts
+- Practice bug reporting and git skills



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

[tor-commits] [community/master] add hangouts to the community portal

[emmapeel]

commit e203c0661645382badb5c1af92394a60d9ad2f6a
Merge: bc2af1d 4547393
Author: emma peel 
Date:   Mon Nov 1 11:06:22 2021 +0100

add hangouts to the community portal

 content/localization/hangouts/contents.lr | 35 +++
 1 file changed, 35 insertions(+)

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

[tor-commits] [community/translations] no need to send to translation, if we are not using this string

[emmapeel]

commit 4a54e42bb97a6ed98b477c535c5c67a5e8604185
Author: emma peel 
Date:   Mon Nov 1 10:26:58 2021 +0100

no need to send to translation, if we are not using this string
---
 templates/outreach-talk.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/outreach-talk.html b/templates/outreach-talk.html
index ce98d72..41de3b2 100644
--- a/templates/outreach-talk.html
+++ b/templates/outreach-talk.html
@@ -72,7 +72,7 @@
 
 
   
-
+
 
 {{ _("Back to previous page: 
") }}{{ this.parent.title }} - https://github.com/torproject/community/edit/master/content{{ this.path 
}}/contents.lr">{{ _("Edit this page") }}
 



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

[tor-commits] [community/translations] we don't need this string

[emmapeel]

commit c3acee8608368a60fbbae99900ce58e7bf38f2f6
Author: emma peel 
Date:   Mon Nov 1 10:57:13 2021 +0100

we don't need this string
---
 i18n/contents.pot | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index f29aa90..45ffb2d 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-11-01 09:50+CET\n"
+"POT-Creation-Date: 2021-11-01 10:29+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -18737,10 +18737,6 @@ msgstr ""
 msgid "Journalists, activists, and everyday internet users rely on Tor."
 msgstr ""
 
-#: templates/outreach-talk.html:75
-msgid "Contributors to this page:"
-msgstr ""
-
 #: templates/outreach-talk.html:77 templates/two-columns-page.html:30
 msgid "Back to previous page: "
 msgstr ""

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

[tor-commits] [community/translations] small translation updates

[emmapeel]

commit 36c896ce835edb63be560042d9db525f9ad3b07f
Author: emma peel 
Date:   Mon Nov 1 10:17:37 2021 +0100

small translation updates
---
 i18n/contents.pot | 12 +++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 8fdf5e6..f29aa90 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-31 21:18+CET\n"
+"POT-Creation-Date: 2021-11-01 09:50+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -18827,6 +18827,16 @@ msgstr ""
 msgid "UX team mailing list"
 msgstr ""
 
+#: templates/user-research.html:39
+msgid "Become a Tester"
+msgstr ""
+
+#: templates/user-research.html:40
+msgid ""
+"We regularly release Tor Browser early versions to allow users to test "
+"software improvements and new ideas. Sign up to be in our testing pool."
+msgstr ""
+
 #: templates/macros/projects.html:20
 msgid "Read more."
 msgstr ""

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

[tor-commits] [community/translations] update templates with missing strings

[emmapeel]

commit a9bfea8112b3a44bf8954fecbad78fa7a3683cf4
Author: emma peel 
Date:   Mon Nov 1 09:48:00 2021 +0100

update templates with missing strings
---
 templates/user-research.html | 4 
 1 file changed, 4 insertions(+)

diff --git a/templates/user-research.html b/templates/user-research.html
index 903831a..2e85280 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -35,4 +35,8 @@
 {{ _('UX team mailing list') }}
   
   
+  
 



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

[tor-commits] [community/master] add strings to template so they make their way to the translation file

[emmapeel]

commit bc2af1d5e2772430278395006a379d7407350e98
Author: emma peel 
Date:   Mon Nov 1 09:45:52 2021 +0100

add strings to template so they make their way to the translation file
---
 templates/user-research.html | 4 
 1 file changed, 4 insertions(+)

diff --git a/templates/user-research.html b/templates/user-research.html
index 903831a..2e85280 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -35,4 +35,8 @@
 {{ _('UX team mailing list') }}
   
   
+  
 

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

[tor-commits] [community/translations] content updates

[emmapeel]

commit c041aaf786f71f0510b3a0858f2f355bd7372f0c
Author: emma peel 
Date:   Sun Oct 31 20:24:56 2021 +0100

content updates
---
 content/relay/setup/guard/centos-rhel/contents.lr   | 4 ++--
 content/relay/setup/guard/debian-ubuntu/contents.lr | 4 ++--
 content/relay/setup/guard/dragonflybsd/contents.lr  | 6 +++---
 content/relay/setup/guard/fedora/contents.lr| 4 ++--
 content/relay/setup/guard/freebsd/contents.lr   | 4 ++--
 content/relay/setup/guard/netbsd/contents.lr| 4 ++--
 content/relay/setup/guard/openbsd/contents.lr   | 4 ++--
 content/relay/setup/guard/windows/contents.lr   | 4 ++--
 8 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/content/relay/setup/guard/centos-rhel/contents.lr 
b/content/relay/setup/guard/centos-rhel/contents.lr
index fc5b7d8..797a552 100644
--- a/content/relay/setup/guard/centos-rhel/contents.lr
+++ b/content/relay/setup/guard/centos-rhel/contents.lr
@@ -81,8 +81,8 @@ Should you use an older release like CentOS/RHEL 6, that will 
be:
 
 ### 7. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/debian-ubuntu/contents.lr 
b/content/relay/setup/guard/debian-ubuntu/contents.lr
index 95f9eef..79a9cc1 100644
--- a/content/relay/setup/guard/debian-ubuntu/contents.lr
+++ b/content/relay/setup/guard/debian-ubuntu/contents.lr
@@ -46,8 +46,8 @@ Restart the `tor` daemon, so your configuration changes take 
effect:
 
 ### 6. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/dragonflybsd/contents.lr 
b/content/relay/setup/guard/dragonflybsd/contents.lr
index 1b0c979..c3b5070 100644
--- a/content/relay/setup/guard/dragonflybsd/contents.lr
+++ b/content/relay/setup/guard/dragonflybsd/contents.lr
@@ -24,7 +24,7 @@ DragonFlyBSD's daily snapshots and releases (starting with 
3.4) come with `pkg`
 
  2.1. Recommended Steps to Setup `pkg`
 
-Here, it will be similar to what we have on a **FreeBSD** system, and we are 
going to use HTTPS to fetch our packages, and updates - so here we also need an 
extra package to help us out (ca_root_nss).
+Here, it will be similar to what we have on a **FreeBSD** system, and we are 
going to use HTTPS to fetch our packages, and updates - so here we also need an 
extra package to help us out (`ca_root_nss`).
 
 Installing the `ca_root_nss` package:
 
@@ -88,8 +88,8 @@ Here we set `tor` to start at boot time and use the setuid 
feature, in order to
 
 ### 6. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/fedora/contents.lr 
b/content/relay/setup/guard/fedora/contents.lr
index 26a016b..0fc7bb0 100644
--- a/content/relay/setup/guard/fedora/contents.lr
+++ b/content/relay/setup/guard/fedora/contents.lr
@@ -54,8 +54,8 @@ SocksPort   0
 
 # 6. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/freebsd/contents.lr 
b/content/relay/setup/guard/freebsd/contents.lr
index 9d05331..30b575d 100644
--- a/content/relay/setup/guard/freebsd/contents.lr
+++ b/content/relay/setup/guard/freebsd/contents.lr
@@ -107,8 +107,8 @@ Here we set `tor` to start at boot time and use the setuid 
feature, in order to
 
 ### 7. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 

[tor-commits] [community/translations] update translation file

[emmapeel]

commit 1fbee10872fdc8528ed177bea9e869a6bf17198f
Author: emma peel 
Date:   Sun Oct 31 21:24:42 2021 +0100

update translation file
---
 i18n/contents.pot | 1149 ++---
 1 file changed, 567 insertions(+), 582 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 32715af..8fdf5e6 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-30 19:51+CET\n"
+"POT-Creation-Date: 2021-10-31 21:18+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -11,56 +11,53 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: (dynamic)
-msgid ""
-"Defend yourself against tracking and surveillance. Circumvent censorship."
-msgstr ""
-
-#: (dynamic)
-msgid "Tor Project"
-msgstr ""
-
-#: (dynamic)
-msgid "Close banner"
-msgstr ""
-
-#: (dynamic)
-msgid "Privacy is a human right"
+#: https://community.torproject.org/ (content/contents+en.lr:page.title)
+msgid "Join the Tor Community"
 msgstr ""
 
-#: (dynamic)
-msgid "Your donation will be matched by Friends of Tor, up to $150,000."
+#: https://community.torproject.org/ (content/contents+en.lr:page.subtitle)
+msgid "Our community is made up of human rights defenders around the world."
 msgstr ""
 
-#: (dynamic)
-msgid "Your donation will be matched by Friends of Tor, up to $100,000."
+#: https://community.torproject.org/ (content/contents+en.lr:page.section)
+#: https://community.torproject.org/outreach/
+#: (content/outreach/contents+en.lr:page.section)
+msgid "community"
 msgstr ""
 
-#: (dynamic)
-msgid "Donate now"
+#: https://community.torproject.org/ (content/contents+en.lr:page.body)
+msgid "The Tor community is made up of all kinds of contributors."
 msgstr ""
 
-#: (dynamic)
-msgid "Donate"
+#: https://community.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"Some people write documentation and bug reports, while others hold Tor "
+"events and conduct outreach."
 msgstr ""
 
-#: (dynamic)
-msgid "Donate Now"
+#: https://community.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"Whether you have a lot of time to volunteer or a little, and whether you "
+"consider yourself technical or not, we want you to join our community, too."
 msgstr ""
 
-#: (dynamic)
-msgid "Menu"
+#: https://community.torproject.org/ (content/contents+en.lr:page.body)
+msgid ""
+"Below, you'll find some different ways to volunteer with the Tor community "
+"as well as resources to better help you help Tor."
 msgstr ""
 
-#: (dynamic)
-msgid "About"
+#: https://community.torproject.org/user-research/
+#: (content/user-research/contents+en.lr:page.title)
+msgid "User Research"
 msgstr ""
 
-#: (dynamic)
-msgid "Support"
+#: https://community.torproject.org/user-research/
+#: (content/user-research/contents+en.lr:page.subtitle)
+msgid "We respect our users' privacy when we conduct research."
 msgstr ""
 
-#: (dynamic) https://community.torproject.org/user-research/
+#: https://community.torproject.org/user-research/
 #: (content/user-research/contents+en.lr:page.section)
 #: https://community.torproject.org/training/
 #: (content/training/contents+en.lr:page.section)
@@ -73,224 +70,11 @@ msgstr ""
 msgid "Community"
 msgstr ""
 
-#: (dynamic)
-msgid "Blog"
-msgstr ""
-
-#: (dynamic)
-msgid "Documentation"
-msgstr ""
-
-#: (dynamic)
-msgid "Jobs"
-msgstr ""
-
-#: (dynamic)
-msgid "Contact"
-msgstr ""
-
-#: (dynamic)
-msgid "Press"
-msgstr ""
-
-#: (dynamic)
-msgid "Download Tor Browser"
-msgstr ""
-
-#: (dynamic) https://community.torproject.org/training/
-#: (content/training/contents+en.lr:page.title)
-#: https://community.torproject.org/training/checklist/
-#: (content/training/checklist/contents+en.lr:page.section)
-#: https://community.torproject.org/training/faq/
-#: (content/training/faq/contents+en.lr:page.section)
-msgid "Training"
-msgstr ""
-
-#: (dynamic) https://community.torproject.org/training/
-#: (content/training/contents+en.lr:page.subtitle)
-#: https://community.torproject.org/training/resources/
-#: (content/training/resources/contents+en.lr:page.subtitle)
-msgid ""
-"Do you teach your community about using Tor? These resources are for you."
-msgstr ""
-
-#: (dynamic) https://community.torproject.org/training/
-#: (content/training/contents+en.lr:page.cta)
-msgid "Check our resources"
-msgstr ""
-
-#: (dynamic) https://community.torproject.org/outreach/
-#: (content/outreach/contents+en.lr:page.title)
-msgid "Outreach"
-msgstr ""
-
-#: (dynamic) https://community.torproject.org/outreach/
-#: (content/outreach/contents+en.lr:page.subtitle)
-msgid "Bring Tor materials to your next community event."
-msgstr ""
-
-#: (dynamic) https://community.torproject.org/
-#: (content/contents+en.lr:page.section)
-#: https://community.torproject.org/outreach/
-#: 

[tor-commits] [community/master] make links relative

[emmapeel]

commit 171b9ef7f0d5d91c6ea50434f1063270a2759cf1
Author: emma peel 
Date:   Sun Oct 31 20:23:20 2021 +0100

make links relative
---
 content/relay/setup/guard/centos-rhel/contents.lr   | 4 ++--
 content/relay/setup/guard/debian-ubuntu/contents.lr | 4 ++--
 content/relay/setup/guard/dragonflybsd/contents.lr  | 4 ++--
 content/relay/setup/guard/fedora/contents.lr| 4 ++--
 content/relay/setup/guard/freebsd/contents.lr   | 4 ++--
 content/relay/setup/guard/netbsd/contents.lr| 4 ++--
 content/relay/setup/guard/openbsd/contents.lr   | 4 ++--
 content/relay/setup/guard/windows/contents.lr   | 4 ++--
 8 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/content/relay/setup/guard/centos-rhel/contents.lr 
b/content/relay/setup/guard/centos-rhel/contents.lr
index fc5b7d8..797a552 100644
--- a/content/relay/setup/guard/centos-rhel/contents.lr
+++ b/content/relay/setup/guard/centos-rhel/contents.lr
@@ -81,8 +81,8 @@ Should you use an older release like CentOS/RHEL 6, that will 
be:
 
 ### 7. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/debian-ubuntu/contents.lr 
b/content/relay/setup/guard/debian-ubuntu/contents.lr
index 95f9eef..79a9cc1 100644
--- a/content/relay/setup/guard/debian-ubuntu/contents.lr
+++ b/content/relay/setup/guard/debian-ubuntu/contents.lr
@@ -46,8 +46,8 @@ Restart the `tor` daemon, so your configuration changes take 
effect:
 
 ### 6. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/dragonflybsd/contents.lr 
b/content/relay/setup/guard/dragonflybsd/contents.lr
index 4c03955..c3b5070 100644
--- a/content/relay/setup/guard/dragonflybsd/contents.lr
+++ b/content/relay/setup/guard/dragonflybsd/contents.lr
@@ -88,8 +88,8 @@ Here we set `tor` to start at boot time and use the setuid 
feature, in order to
 
 ### 6. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/fedora/contents.lr 
b/content/relay/setup/guard/fedora/contents.lr
index 26a016b..0fc7bb0 100644
--- a/content/relay/setup/guard/fedora/contents.lr
+++ b/content/relay/setup/guard/fedora/contents.lr
@@ -54,8 +54,8 @@ SocksPort   0
 
 # 6. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/freebsd/contents.lr 
b/content/relay/setup/guard/freebsd/contents.lr
index 9d05331..30b575d 100644
--- a/content/relay/setup/guard/freebsd/contents.lr
+++ b/content/relay/setup/guard/freebsd/contents.lr
@@ -107,8 +107,8 @@ Here we set `tor` to start at boot time and use the setuid 
feature, in order to
 
 ### 7. Final Notes
 
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
+If you are having trouble setting up your relay, have a look at our [help 
section](../../../getting-help/).
+If your relay is now running, check out the 
[post-install](../../post-install/) notes.
 ---
 html: two-columns-page.html
 ---
diff --git a/content/relay/setup/guard/netbsd/contents.lr 
b/content/relay/setup/guard/netbsd/contents.lr
index 199f6b2..f6bb890 100644
--- a/content/relay/setup/guard/netbsd/contents.lr
+++ b/content/relay/setup/guard/netbsd/contents.lr
@@ -51,8 +51,8 @@ Here we set `tor` to start during boot and call it for the 

[tor-commits] [manual/master] small layout correction

[emmapeel]

commit 4ace5978b9079e0a7076b9d391260b28b7bc4010
Author: emma peel 
Date:   Sun Oct 31 16:12:41 2021 +0100

small layout correction
---
 content/uninstalling/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/uninstalling/contents.lr b/content/uninstalling/contents.lr
index 05a8e2a..a3452be 100644
--- a/content/uninstalling/contents.lr
+++ b/content/uninstalling/contents.lr
@@ -24,7 +24,7 @@ On macOS:
 
 
 
-*  Then type "~/Library/Application Support/" in the window and click Go.
+* Then type `~/Library/Application Support/` in the window and click Go.
 
 
 

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

[tor-commits] [community/master] so it is the same as the bridge instructions

[emmapeel]

commit eec2c01551d1acc40b717e0fb3776a9240d5d949
Author: emma peel 
Date:   Sun Oct 31 16:04:44 2021 +0100

so it is the same as the bridge instructions
---
 content/relay/setup/guard/dragonflybsd/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/relay/setup/guard/dragonflybsd/contents.lr 
b/content/relay/setup/guard/dragonflybsd/contents.lr
index 1b0c979..4c03955 100644
--- a/content/relay/setup/guard/dragonflybsd/contents.lr
+++ b/content/relay/setup/guard/dragonflybsd/contents.lr
@@ -24,7 +24,7 @@ DragonFlyBSD's daily snapshots and releases (starting with 
3.4) come with `pkg`
 
  2.1. Recommended Steps to Setup `pkg`
 
-Here, it will be similar to what we have on a **FreeBSD** system, and we are 
going to use HTTPS to fetch our packages, and updates - so here we also need an 
extra package to help us out (ca_root_nss).
+Here, it will be similar to what we have on a **FreeBSD** system, and we are 
going to use HTTPS to fetch our packages, and updates - so here we also need an 
extra package to help us out (`ca_root_nss`).
 
 Installing the `ca_root_nss` package:
 

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

[tor-commits] [community/translations] update translation file

[emmapeel]

commit 6eb5f9d1d00be8e2d1e2a477e4f3505e56a3f8b9
Author: emma peel 
Date:   Sat Oct 30 20:00:47 2021 +0200

update translation file
---
 i18n/contents.pot | 1131 +++--
 1 file changed, 570 insertions(+), 561 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index b1c2f33..32715af 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-30 08:55+CET\n"
+"POT-Creation-Date: 2021-10-30 19:51+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -11,53 +11,56 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: https://community.torproject.org/ (content/contents+en.lr:page.title)
-msgid "Join the Tor Community"
+#: (dynamic)
+msgid ""
+"Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
 
-#: https://community.torproject.org/ (content/contents+en.lr:page.subtitle)
-msgid "Our community is made up of human rights defenders around the world."
+#: (dynamic)
+msgid "Tor Project"
 msgstr ""
 
-#: https://community.torproject.org/ (content/contents+en.lr:page.section)
-#: https://community.torproject.org/outreach/
-#: (content/outreach/contents+en.lr:page.section)
-msgid "community"
+#: (dynamic)
+msgid "Close banner"
 msgstr ""
 
-#: https://community.torproject.org/ (content/contents+en.lr:page.body)
-msgid "The Tor community is made up of all kinds of contributors."
+#: (dynamic)
+msgid "Privacy is a human right"
 msgstr ""
 
-#: https://community.torproject.org/ (content/contents+en.lr:page.body)
-msgid ""
-"Some people write documentation and bug reports, while others hold Tor "
-"events and conduct outreach."
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
 
-#: https://community.torproject.org/ (content/contents+en.lr:page.body)
-msgid ""
-"Whether you have a lot of time to volunteer or a little, and whether you "
-"consider yourself technical or not, we want you to join our community, too."
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 
-#: https://community.torproject.org/ (content/contents+en.lr:page.body)
-msgid ""
-"Below, you'll find some different ways to volunteer with the Tor community "
-"as well as resources to better help you help Tor."
+#: (dynamic)
+msgid "Donate now"
 msgstr ""
 
-#: https://community.torproject.org/user-research/
-#: (content/user-research/contents+en.lr:page.title)
-msgid "User Research"
+#: (dynamic)
+msgid "Donate"
 msgstr ""
 
-#: https://community.torproject.org/user-research/
-#: (content/user-research/contents+en.lr:page.subtitle)
-msgid "We respect our users' privacy when we conduct research."
+#: (dynamic)
+msgid "Donate Now"
 msgstr ""
 
-#: https://community.torproject.org/user-research/
+#: (dynamic)
+msgid "Menu"
+msgstr ""
+
+#: (dynamic)
+msgid "About"
+msgstr ""
+
+#: (dynamic)
+msgid "Support"
+msgstr ""
+
+#: (dynamic) https://community.torproject.org/user-research/
 #: (content/user-research/contents+en.lr:page.section)
 #: https://community.torproject.org/training/
 #: (content/training/contents+en.lr:page.section)
@@ -70,11 +73,224 @@ msgstr ""
 msgid "Community"
 msgstr ""
 
-#: https://community.torproject.org/user-research/
+#: (dynamic)
+msgid "Blog"
+msgstr ""
+
+#: (dynamic)
+msgid "Documentation"
+msgstr ""
+
+#: (dynamic)
+msgid "Jobs"
+msgstr ""
+
+#: (dynamic)
+msgid "Contact"
+msgstr ""
+
+#: (dynamic)
+msgid "Press"
+msgstr ""
+
+#: (dynamic)
+msgid "Download Tor Browser"
+msgstr ""
+
+#: (dynamic) https://community.torproject.org/training/
+#: (content/training/contents+en.lr:page.title)
+#: https://community.torproject.org/training/checklist/
+#: (content/training/checklist/contents+en.lr:page.section)
+#: https://community.torproject.org/training/faq/
+#: (content/training/faq/contents+en.lr:page.section)
+msgid "Training"
+msgstr ""
+
+#: (dynamic) https://community.torproject.org/training/
+#: (content/training/contents+en.lr:page.subtitle)
+#: https://community.torproject.org/training/resources/
+#: (content/training/resources/contents+en.lr:page.subtitle)
+msgid ""
+"Do you teach your community about using Tor? These resources are for you."
+msgstr ""
+
+#: (dynamic) https://community.torproject.org/training/
+#: (content/training/contents+en.lr:page.cta)
+msgid "Check our resources"
+msgstr ""
+
+#: (dynamic) https://community.torproject.org/outreach/
+#: (content/outreach/contents+en.lr:page.title)
+msgid "Outreach"
+msgstr ""
+
+#: (dynamic) https://community.torproject.org/outreach/
+#: (content/outreach/contents+en.lr:page.subtitle)
+msgid "Bring Tor materials to your next community event."
+msgstr ""
+
+#: (dynamic) https://community.torproject.org/
+#: (content/contents+en.lr:page.section)
+#: 

[tor-commits] [community/translations] databags changes

[emmapeel]

commit cbe4cb521f6f17dd24bc8c2ff3d2e7be514d042d
Author: emma peel 
Date:   Sat Oct 30 20:04:48 2021 +0200

databags changes
---
 databags/links.ini   | 1 +
 databags/pagenav.ini | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/databags/links.ini b/databags/links.ini
new file mode 12
index 000..fa8bbfe
--- /dev/null
+++ b/databags/links.ini
@@ -0,0 +1 @@
+../lego/databags/links.ini
\ No newline at end of file
diff --git a/databags/pagenav.ini b/databags/pagenav.ini
index 57c87f6..c050cc8 100644
--- a/databags/pagenav.ini
+++ b/databags/pagenav.ini
@@ -14,8 +14,8 @@ label = Outreach
 path = user-research
 label = User Research
 
-[relay-operations]
-path = relay-operations
+[relay]
+path = relay
 label = Relay Operations
 
 [onion-services]

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

[tor-commits] [tpo/translations] update lego

[emmapeel]

commit f7cdeb28bad4de950b4ce4b7085bd30e4558980b
Author: emma peel 
Date:   Sat Oct 30 18:34:31 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index c615f285..796f47ca 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7
+Subproject commit 796f47cab97c1b574411006bc1c832ba205c3acd

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

[tor-commits] [manual/translations] update translation file

[emmapeel]

commit 995a94343a2dce2285642fcba172ef478fb494d6
Author: emma peel 
Date:   Sat Oct 30 09:10:14 2021 +0200

update translation file
---
 i18n/contents.pot | 321 --
 1 file changed, 166 insertions(+), 155 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 4bd8dec..3d0f2d3 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-28 11:50+CET\n"
+"POT-Creation-Date: 2021-10-30 09:08+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -11,261 +11,155 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: (dynamic)
-msgid ""
-"Defend yourself against tracking and surveillance. Circumvent censorship."
-msgstr ""
-
-#: (dynamic)
-msgid "Tor Project | Tor Browser Manual"
-msgstr ""
-
-#: (dynamic)
-msgid "Close banner"
-msgstr ""
-
-#: (dynamic)
-msgid "Privacy is a human right"
-msgstr ""
-
-#: (dynamic)
-msgid "Your donation will be matched by Friends of Tor, up to $150,000."
-msgstr ""
-
-#: (dynamic)
-msgid "Your donation will be matched by Friends of Tor, up to $100,000."
-msgstr ""
-
-#: (dynamic)
-msgid "Donate now"
-msgstr ""
-
-#: (dynamic)
-msgid "Donate"
-msgstr ""
-
-#: (dynamic)
-msgid "Donate Now"
-msgstr ""
-
-#: (dynamic)
-msgid "Menu"
+#: https://tb-manual.torproject.org/ (content/contents+en.lr:showcase.title)
+msgid "Tor Browser User Manual"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "About"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Support"
+msgid "Documentation"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Community"
+msgid "Press"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "Blog"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Documentation"
+msgid "Newsletter"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Jobs"
+msgid "Support"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Contact"
+msgid "Community"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Press"
-msgstr ""
-
-#: (dynamic)
-msgid "Download Tor Browser"
-msgstr ""
-
-#: (dynamic)
-msgid "Search"
-msgstr ""
-
-#: (dynamic) https://tb-manual.torproject.org/
-#: (content/contents+en.lr:showcase.title)
-msgid "Tor Browser User Manual"
-msgstr ""
-
-#: (dynamic)
-msgid ""
-"Download Tor Browser to experience real private browsing without tracking, "
-"surveillance, or censorship."
-msgstr ""
-
-#: (dynamic)
-msgid "Our mission:"
-msgstr ""
-
-#: (dynamic)
-msgid ""
-"To advance human rights and freedoms by creating and deploying free and open "
-"source anonymity and privacy technologies, supporting their unrestricted "
-"availability and use, and furthering their scientific and popular "
-"understanding."
+msgid "Contact"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "PrivChat"
-msgstr ""
-
-#: (dynamic)
-msgid "Subscribe to our Newsletter"
-msgstr ""
-
-#: (dynamic)
-msgid "Get monthly updates and opportunities from the Tor Project:"
-msgstr ""
-
-#: (dynamic)
-msgid "Sign up"
-msgstr ""
-
-#: (dynamic)
-msgid ""
-"Trademark, copyright notices, and rules for use by third parties can be "
-"found in our %(link_to_faq)s"
-msgstr ""
-
-#: (dynamic)
-msgid "Topics"
+msgid "Jobs"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "About Tor Browser"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "Downloading"
 msgstr ""
 
-#: (dynamic) https://tb-manual.torproject.org/menu/
+#: https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Installation"
+msgid "Running Tor Browser for the First Time"
 msgstr ""
 
-#: (dynamic) 

[tor-commits] [manual/translations] lego and images updates

[emmapeel]

commit 9f98c40296a849e9277b48560916c52f17cd2ad7
Author: emma peel 
Date:   Sat Oct 30 09:05:16 2021 +0200

lego and images updates
---
 assets/static/images/proxy_question.png | Bin 9105 -> 0 bytes
 lego|   2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/static/images/proxy_question.png 
b/assets/static/images/proxy_question.png
deleted file mode 100644
index ec45f1c..000
Binary files a/assets/static/images/proxy_question.png and /dev/null differ
diff --git a/lego b/lego
index c615f28..796f47c 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7
+Subproject commit 796f47cab97c1b574411006bc1c832ba205c3acd



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

[tor-commits] [manual/master] update lego

[emmapeel]

commit 622bfb5b7cad3d24e888a4ccf29fca4d151c4c59
Author: emma peel 
Date:   Sat Oct 30 09:03:29 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index c615f28..796f47c 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7
+Subproject commit 796f47cab97c1b574411006bc1c832ba205c3acd

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

[tor-commits] [community/translations] content updates

[emmapeel]

commit 00e9358488b433ce8d2c7f71a94f3f78c8ec9340
Author: emma peel 
Date:   Sat Oct 30 08:48:48 2021 +0200

content updates
---
 content/relay/setup/guard/centosrhel/contents.lr   | 78 --
 .../setup/guard/centosrhel/updates/contents.lr | 94 --
 content/relay/setup/guard/debianubuntu/contents.lr | 60 --
 .../setup/guard/debianubuntu/updates/contents.lr   | 63 ---
 databags/onions.ini|  2 +-
 5 files changed, 1 insertion(+), 296 deletions(-)

diff --git a/content/relay/setup/guard/centosrhel/contents.lr 
b/content/relay/setup/guard/centosrhel/contents.lr
deleted file mode 100644
index e5e7afd..000
--- a/content/relay/setup/guard/centosrhel/contents.lr
+++ /dev/null
@@ -1,78 +0,0 @@
-_model: page

-color: primary

-title: CentOS/RHEL

-body:
-
-# 1. Enable Automatic Software Updates
-
-One of the most important things to keeps your relay secure is to install 
security updates timely and ideally automatically so you can not forget about 
it. Follow the instructions to enable [automatic software updates](updates) for 
your operating system.
-
-# 2. Enable the EPEL repository
-
-To install `tor` package on CentOS/RHEL, you need to install the 
[EPEL](https://fedoraproject.org/wiki/EPEL) repository first:
-
-`yum install epel-release`
-
-# 3. Add the following to /etc/yum.repos.d/tor.repo and then install the tor 
package.
-
-```
-[tor]
-name=Tor for Enterprise Linux $releasever - $basearch
-baseurl=https://rpm.torproject.org/centos/$releasever/$basearch
-enabled=1
-gpgcheck=1
-gpgkey=https://rpm.torproject.org/centos/public_gpg.key
-cost=100
-```
-
-`yum install tor`
-
-When you install the first package from the EPEL repository you will be asked 
about verifying the EPEL GPG signing key.
-Please ensure the key matches with the one available on the [Fedora Project 
website](https://getfedora.org/keys/).
-
-# 4. Put the tor configuration file `/etc/tor/torrc` in place
-
-```
-#change the nickname "myNiceRelay" to a name that you like
-Nickname myNiceRelay
-ORPort 9001
-SocksPort 0
-ExitRelay 0
-# Change the email address below and be aware that it will be published
-ContactInfo tor-operator@your-emailaddress-domain
-```
-
-# 5. Enable and start your Tor relay
-
-CentOS 7 / RHEL 7:
-
-```
-systemctl enable tor
-systemctl start tor
-```
-
-CentOS 6 / RHEL 6:
-
-```
-service tor enable
-service tor start
-```
-
-# 6. Final notes
-
-If you are having trouble setting up your relay, have a look at our [help 
section](/relay/getting-help/).
-If your relay is now running, check out the 
[post-install](/relay/setup/post-install/) notes.
-

-html: two-columns-page.html

-key: 1

-section: Middle/Guard relay

-section_id: relay-operations

-subtitle: How to deploy a middle/Guard relay on CentOS/RHEL
diff --git a/content/relay/setup/guard/centosrhel/updates/contents.lr 
b/content/relay/setup/guard/centosrhel/updates/contents.lr
deleted file mode 100644
index 7f67dcc..000
--- a/content/relay/setup/guard/centosrhel/updates/contents.lr
+++ /dev/null
@@ -1,94 +0,0 @@
-_model: page

-color: primary

-title: RPM Distributions

-body:
-
-# CentOS and RHEL 8 or later versions
-
-For CentOS and RHEL 8 or later versions, the dnf-automatic package is the 
preferred approach:
-
-```
-dnf install dnf-automatic
-```
-
-In /etc/dnf/automatic.conf set:
-
-```
-download_updates = yes
-apply_updates = yes
-```
-
-Enable and start automatic updates via:
-
-```
-systemctl enable --now dnf-automatic.timer
-```
-
-Check status of dnf-automatic:
-```
-systemctl list-timers *dnf-*
-```
-
-# CentOS and RHEL 7 or earlier versions
-
-For CentOS and RHEL 7 or earlier versions, the yum-cron package is the 
preferred approach:
-
-```
-yum install yum-cron
-```
-
-In /etc/yum/yum-cron.conf set:
-
-```
-download_updates = yes
-apply_updates = yes
-```
-
-Enable and start automatic updates via:
-
-```
-systemctl start yum-cron.service
-```
-
-# openSUSE
-
-First, you need to install the automatic update package
-
-```
-zypper install  yast2-online-update-configuration
-```
-
-Then start the configuration tool (ncurses based) with:
-
-```
-yast2 online_update_configuration
-```
-
-Enable the following settings:
-
-```
-Automatic Online Update
-Interval: Daily
-Skip Interactive Patches
-Agree with Licenses
-Use delta rpms
-```
-
-Confirm your configuration with OK.
-
-The official openSUSE documentation can be found 
[here](https://doc.opensuse.org/documentation/leap/startup/single-html/book.opensuse.startup/index.html#sec-onlineupdate-you-automatically).

-html: two-columns-page.html

-key: 1

-section: Automatic Updates

-section_id: automatic-updates

-_slug: updates

-_discoverable: no
diff --git a/content/relay/setup/guard/debianubuntu/contents.lr 
b/content/relay/setup/guard/debianubuntu/contents.lr
deleted file mode 100644
index 884e4f9..000
--- 

[tor-commits] [community/translations] frontend fixes

[emmapeel]

commit 3df44d08dd5712b85992e0e85982c9a73def853a
Author: emma peel 
Date:   Fri Oct 29 12:34:37 2021 +0200

frontend fixes
---
 templates/home.html | 2 +-
 templates/outreach.html | 2 +-
 templates/training.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/home.html b/templates/home.html
index f95a873..b81314c 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -14,7 +14,7 @@
 {{ _(child.title) }}
 {{ _(child.subtitle) }}
 
-  
+  
 
   
   {{ 
_(child.cta) }}
diff --git a/templates/outreach.html b/templates/outreach.html
index a640059..4a606f3 100644
--- a/templates/outreach.html
+++ b/templates/outreach.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   
diff --git a/templates/training.html b/templates/training.html
index 39d6df0..c3b5a5b 100644
--- a/templates/training.html
+++ b/templates/training.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   



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

[tor-commits] [community/translations] update translations file

[emmapeel]

commit df58ce5af27a4ea57d52d2eb45f22af851cdd232
Author: emma peel 
Date:   Sat Oct 30 09:01:17 2021 +0200

update translations file
---
 i18n/contents.pot | 564 --
 1 file changed, 119 insertions(+), 445 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index f19547e..b1c2f33 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-26 18:39+CET\n"
+"POT-Creation-Date: 2021-10-30 08:55+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -3623,12 +3623,8 @@ msgstr ""
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/dragonflybsd/
 #: (content/relay/setup/guard/dragonflybsd/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/centosrhel/
-#: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/fedora/
 #: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/debianubuntu/
-#: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/freebsd/
 #: (content/relay/setup/guard/freebsd/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centos-rhel/
@@ -3637,12 +3633,8 @@ msgstr ""
 #: (content/relay/setup/guard/openbsd/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/debian-ubuntu/updates/
 #: (content/relay/setup/guard/debian-ubuntu/updates/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/centosrhel/updates/
-#: (content/relay/setup/guard/centosrhel/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/fedora/updates/
 #: (content/relay/setup/guard/fedora/updates/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/debianubuntu/updates/
-#: (content/relay/setup/guard/debianubuntu/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/freebsd/updates/
 #: (content/relay/setup/guard/freebsd/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centos-rhel/updates/
@@ -6333,10 +6325,6 @@ msgstr ""
 #: 
(content/training/resources/tor-relay-workshop/contents+en.lr:slide.description)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/centosrhel/
-#: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/debianubuntu/
-#: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "Nickname myNiceRelay"
 msgstr ""
 
@@ -6344,10 +6332,6 @@ msgstr ""
 #: 
(content/training/resources/tor-relay-workshop/contents+en.lr:slide.description)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/centosrhel/
-#: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/debianubuntu/
-#: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "ExitRelay 0"
 msgstr ""
 
@@ -6355,10 +6339,6 @@ msgstr ""
 #: 
(content/training/resources/tor-relay-workshop/contents+en.lr:slide.description)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/centosrhel/
-#: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/debianubuntu/
-#: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "SocksPort 0"
 msgstr ""
 
@@ -6376,10 +6356,6 @@ msgstr ""
 #: 
(content/training/resources/tor-relay-workshop/contents+en.lr:slide.description)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/centosrhel/
-#: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/debianubuntu/
-#: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "ContactInfo tor-operator@your-emailaddress-domain"
 msgstr ""
 
@@ -6419,15 +6395,11 @@ msgstr ""
 #: 
(content/training/resources/tor-relay-workshop/contents+en.lr:slide.description)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
-#: 

[tor-commits] [community/translations] update lego

[emmapeel]

commit a3684d34e097986111e72e89f1ff9eafd31cde4a
Author: emma peel 
Date:   Fri Oct 29 09:51:06 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index bc96ee5..796f47c 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit bc96ee58985e63529559653e14b42430ad972c10
+Subproject commit 796f47cab97c1b574411006bc1c832ba205c3acd

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

[tor-commits] [tpo/translations] content and lego updates

[emmapeel]

commit f94392348537e0133ab739ab0a4b0991fc3b5347
Author: emma peel 
Date:   Thu Oct 28 10:17:54 2021 +0200

content and lego updates
---
 content/about/people/dgoulet/contents.lr |  2 +-
 content/about/people/egypcio/contents.lr |  2 ++
 content/about/people/eta/contents.lr | 22 ++
 content/about/people/jvoisin/contents.lr | 21 +
 lego |  2 +-
 templates/press.html |  2 +-
 6 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/content/about/people/dgoulet/contents.lr 
b/content/about/people/dgoulet/contents.lr
index 80ecc2e8..6d582346 100644
--- a/content/about/people/dgoulet/contents.lr
+++ b/content/about/people/dgoulet/contents.lr
@@ -14,4 +14,4 @@ image: /static/images/people/dgoulet.png
 ---
 description:
 
-Tor development team focusing on onion services and our torsocks maintainer.
+Tor development. Member of the Network Team.
diff --git a/content/about/people/egypcio/contents.lr 
b/content/about/people/egypcio/contents.lr
index 7bb3faf4..151b1ea6 100644
--- a/content/about/people/egypcio/contents.lr
+++ b/content/about/people/egypcio/contents.lr
@@ -8,6 +8,8 @@ name: Vinicius Zavam
 ---
 nickname: egypcio
 ---
+pronoun: he
+---
 twitter_handle: egypcio
 ---
 gpg: /static/keys/egypcio.txt
diff --git a/content/about/people/eta/contents.lr 
b/content/about/people/eta/contents.lr
new file mode 100644
index ..064236ea
--- /dev/null
+++ b/content/about/people/eta/contents.lr
@@ -0,0 +1,22 @@
+_model: person
+---
+_hidden: yes
+---
+role: core
+---
+name: eta
+---
+twitter_handle: eta9
+---
+pronoun: she/her
+---
+nickname: eta
+---
+gpg: https://eta.st/tor-pubkey.asc
+---
+image: /static/images/people/eta.png
+---
+
+description:
+
+Member of the Network Team, working on 
[Arti](https://gitlab.torproject.org/tpo/core/arti).
diff --git a/content/about/people/jvoisin/contents.lr 
b/content/about/people/jvoisin/contents.lr
new file mode 100644
index ..588b04e2
--- /dev/null
+++ b/content/about/people/jvoisin/contents.lr
@@ -0,0 +1,21 @@
+_model: person
+---
+_hidden: yes
+---
+role: core
+---
+name: Julien Voisin
+---
+twitter_handle: dustriorg
+---
+pronoun: he
+---
+nickname: jvoisin
+---
+gpg: 
https://db.torproject.org/fetchkey.cgi?fingerprint=9FCDEE9E1A381F311EA62A7404D041E8171901CC
+---
+image: /static/images/people/jvoisin.jpg
+---
+description:
+
+Sysadmin for [Nos Oignons](https://nos-oignons.net) and maintainer of 
[mat2](https://0xacab.org/jvoisin/mat2).
diff --git a/lego b/lego
index 5db6fa6d..c615f285 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b
+Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7
diff --git a/templates/press.html b/templates/press.html
index 2ea49a82..5a07e169 100644
--- a/templates/press.html
+++ b/templates/press.html
@@ -9,7 +9,7 @@
 https://support.torproject.org/; 
title="Tor Project Support Portal" target="_blank">{{ _('Visit our Support 
Portal') }}
   
   
-https://webchat.oftc.net/; title="Tor 
Project IRC" target="_blank">{{ _('Ask us on #tor') }}
+https://webchat.oftc.net/?channels=tor; title="Tor Project IRC" 
target="_blank">{{ _('Ask us on #tor') }}
   
   
 http://lists.torproject.org/; 
title="Tor Project Mailing List" target="_blank">{{ _('Write to a mailing 
list') }}



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

[tor-commits] [tpo/translations] update translation file

[emmapeel]

commit fa0aa5c5f0c9fba8428cbf70e12ef698939cde91
Author: emma peel 
Date:   Thu Oct 28 14:28:48 2021 +0200

update translation file
---
 i18n/contents.pot | 41 +
 1 file changed, 21 insertions(+), 20 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 323d6464..832ca1c0 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-08 13:14+CET\n"
+"POT-Creation-Date: 2021-10-28 13:28+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -239,14 +239,6 @@ msgid ""
 "methods for Tails."
 msgstr ""
 
-#: https://www.torproject.org/press/-new-release-tor/
-#: (content/press/new-release-tor/contents+en.lr:post.summary)
-msgid ""
-"There's a new alpha release available for download. If you build Tor from "
-"source, you can download the source code for 0.4.0.1-alpha from the usual "
-"place on the website."
-msgstr ""
-
 #: https://www.torproject.org/press/-new-release-tor-browser/
 #: (content/press/new-release-tor-browser/contents+en.lr:post.summary)
 msgid ""
@@ -256,6 +248,14 @@ msgid ""
 "\">distribution directory."
 msgstr ""
 
+#: https://www.torproject.org/press/-new-release-tor/
+#: (content/press/new-release-tor/contents+en.lr:post.summary)
+msgid ""
+"There's a new alpha release available for download. If you build Tor from "
+"source, you can download the source code for 0.4.0.1-alpha from the usual "
+"place on the website."
+msgstr ""
+
 #: https://www.torproject.org/releases/tor-browser-95/
 #: (content/releases/tor-browser-95/contents+en.lr:page.title)
 msgid "Tor Browser 9.5"
@@ -1262,25 +1262,26 @@ msgid "Close banner"
 msgstr ""
 
 #: lego/templates/banner.html:11 templates/banner.html:11
-msgid "Use a Mask, Use Tor."
+msgid "Privacy is a human right"
 msgstr ""
 
-#: lego/templates/banner.html:20 templates/banner.html:20
-msgid "Resist the surveillance pandemic."
+#: lego/templates/banner.html:15 templates/banner.html:15
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
 
-#: lego/templates/banner.html:32 templates/banner.html:32
+#: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 
-#: lego/templates/banner.html:40 templates/banner.html:40
-msgid "DONATE NOW"
+#: lego/templates/banner.html:31 lego/templates/banner.html:33
+#: templates/banner.html:31 templates/banner.html:33
+msgid "Donate now"
 msgstr ""
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
-#: lego/templates/navbar.html:83 templates/footer.html:13
+#: lego/templates/navbar.html:96 templates/footer.html:13
 #: templates/footer.html:22 templates/hero-home.html:13
-#: templates/navbar.html:83
+#: templates/navbar.html:96
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -1319,15 +1320,15 @@ msgstr ""
 msgid "Sign up"
 msgstr ""
 
-#: lego/templates/footer.html:98 templates/footer-min.html:67
-#: templates/footer.html:98
+#: lego/templates/footer.html:101 templates/footer-min.html:67
+#: templates/footer.html:101
 #, python-format
 msgid ""
 "Trademark, copyright notices, and rules for use by third parties can be "
 "found in our %(link_to_faq)s"
 msgstr ""
 
-#: lego/templates/navbar.html:25 templates/navbar.html:25
+#: lego/templates/navbar.html:26 templates/navbar.html:26
 msgid "Menu"
 msgstr ""
 

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

[tor-commits] [manual/translations] update lego

[emmapeel]

commit d4624849789d159a5d74d1f0dad1d6823a3d5e03
Author: emma peel 
Date:   Thu Oct 28 11:10:16 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 96effb7..c615f28 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 96effb77f3538a99f9b0198d6ff8a63228c5ac37
+Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7



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

[tor-commits] [manual/translations] update translation file

[emmapeel]

commit 3d96e57e64c338dc3fb76d8c9e4261a347188661
Author: emma peel 
Date:   Thu Oct 28 12:20:14 2021 +0200

update translation file
---
 i18n/contents.pot | 328 ++
 1 file changed, 160 insertions(+), 168 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 17b7659..4bd8dec 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-07 17:29+CET\n"
+"POT-Creation-Date: 2021-10-28 11:50+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -11,150 +11,261 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: https://tb-manual.torproject.org/ (content/contents+en.lr:showcase.title)
-msgid "Tor Browser User Manual"
+#: (dynamic)
+msgid ""
+"Defend yourself against tracking and surveillance. Circumvent censorship."
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Tor Project | Tor Browser Manual"
+msgstr ""
+
+#: (dynamic)
+msgid "Close banner"
+msgstr ""
+
+#: (dynamic)
+msgid "Privacy is a human right"
+msgstr ""
+
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
+msgstr ""
+
+#: (dynamic)
+msgid "Your donation will be matched by Friends of Tor, up to $100,000."
+msgstr ""
+
+#: (dynamic)
+msgid "Donate now"
+msgstr ""
+
+#: (dynamic)
+msgid "Donate"
+msgstr ""
+
+#: (dynamic)
+msgid "Donate Now"
+msgstr ""
+
+#: (dynamic)
+msgid "Menu"
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "About"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Documentation"
+msgid "Support"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Press"
+msgid "Community"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "Blog"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Newsletter"
+msgid "Documentation"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Support"
+msgid "Jobs"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Community"
+msgid "Contact"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Contact"
+msgid "Press"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Download Tor Browser"
+msgstr ""
+
+#: (dynamic)
+msgid "Search"
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/
+#: (content/contents+en.lr:showcase.title)
+msgid "Tor Browser User Manual"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"Download Tor Browser to experience real private browsing without tracking, "
+"surveillance, or censorship."
+msgstr ""
+
+#: (dynamic)
+msgid "Our mission:"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"To advance human rights and freedoms by creating and deploying free and open "
+"source anonymity and privacy technologies, supporting their unrestricted "
+"availability and use, and furthering their scientific and popular "
+"understanding."
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Jobs"
+msgid "PrivChat"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic)
+msgid "Subscribe to our Newsletter"
+msgstr ""
+
+#: (dynamic)
+msgid "Get monthly updates and opportunities from the Tor Project:"
+msgstr ""
+
+#: (dynamic)
+msgid "Sign up"
+msgstr ""
+
+#: (dynamic)
+msgid ""
+"Trademark, copyright notices, and rules for use by third parties can be "
+"found in our %(link_to_faq)s"
+msgstr ""
+
+#: (dynamic)
+msgid "Topics"
+msgstr ""
+
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "About Tor Browser"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
 msgid "Downloading"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: (dynamic) https://tb-manual.torproject.org/menu/
 #: (content/menu/contents+en.lr:topic.body)
-msgid "Running Tor Browser for the First Time"
+msgid "Installation"
 msgstr ""
 
-#: https://tb-manual.torproject.org/menu/
+#: 

[tor-commits] [manual/translations] content updates

[emmapeel]

commit f2f441c0c8aa7286e949ffd56480588baea9759f
Author: emma peel 
Date:   Thu Oct 28 11:10:08 2021 +0200

content updates
---
 content/installation/contents.lr | 4 ++--
 content/menu/contents.lr | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/installation/contents.lr b/content/installation/contents.lr
index 18f54bf..86432f4 100644
--- a/content/installation/contents.lr
+++ b/content/installation/contents.lr
@@ -73,7 +73,7 @@ To change this behavior and launch Tor Browser instead, 
follow this:
 
**Note:** If this command fails to run, you probably need to make the file 
executable. From within this directory run: `chmod +x start-tor-browser.desktop`
 
-* Some additional flags that can be used with `start-tor-browser.desktop` from 
the command-line:
+Some additional flags that can be used with `start-tor-browser.desktop` from 
the command-line:
 
 | **Flag** | **Description** |
 |--|-|
@@ -84,4 +84,4 @@ To change this behavior and launch Tor Browser instead, 
follow this:
 | `--unregister-app` | To unregister Tor Browser as a desktop application. |
 
 
-See here on how to [update Tor 
Browser](https://tb-manual.torproject.org/updating/).
+See here on how to [update Tor Browser](../updating/).
diff --git a/content/menu/contents.lr b/content/menu/contents.lr
index ac004f1..9a82bf3 100644
--- a/content/menu/contents.lr
+++ b/content/menu/contents.lr
@@ -36,4 +36,4 @@ Mobile Tor
 Becoming a Tor Translator
 Making Tor Browser Portable
 Installation
-
+PrivChat



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

[tor-commits] [manual/master] better rules for different branches

[emmapeel]

commit cbf0b170bbb6b340e7aac93041763356f904a0e0
Author: emma peel 
Date:   Thu Oct 28 10:49:08 2021 +0200

better rules for different branches
---
 .gitlab-ci.yml | 15 ++-
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 619afa8..ea4f9e7 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,17 +78,13 @@ check_new_strings:
   allow_failure: true
   rules:
 - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-- if: '$CI_COMMIT_BRANCH == "translations"'
-  when: never
-- changes:
-  - content/**/*.lr
-  - templates/**/*
+- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+
   script:
 - *apt-template
 - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y
 - git clone https://gitlab.torproject.org/tpo/community/l10n.git
-- echo 'lets see if there are any updates in the strings for translation'
+- echo 'lets see if there are any UPDATES ON THE STRINGS for translation 
after this changes'
 - l10n/bin/check_po_status.py $TRANSLATION_BRANCH
   artifacts:
 paths:
@@ -113,6 +109,7 @@ check_l10n:
 - translations
   script:
 - DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector 
python3-polib ca-certificates -y
-- echo 'lets see if there are any broken links on the translations'
+- rm -rf l10n
+- git clone https://gitlab.torproject.org/tpo/community/l10n.git
+- echo 'lets see if there are any BROKEN LINKS on the translations'
 - l10n/bin/check_markdown_links.py i18n/
-



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

[tor-commits] [manual/master] update lego

[emmapeel]

commit d0c0f4cea47e65984f2f296b9291a6124fb6484d
Author: emma peel 
Date:   Thu Oct 28 10:58:01 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index c8ed9e1..c615f28 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit c8ed9e1d9cd895cdfb1a9b18822310b40cc93f58
+Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7

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

[tor-commits] [tpo/master] this conditions were not working. this is a better solution

[emmapeel]

commit 0efd1225f7782578e7e69ce413a3b74f7a77618c
Author: emma peel 
Date:   Thu Oct 28 10:16:22 2021 +0200

this conditions were not working. this is a better solution
---
 .gitlab-ci.yml | 7 +--
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 06d12ea8..e64f0631 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,12 +78,7 @@ check_new_strings:
   allow_failure: true
   rules:
 - if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
-- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
-- if: '$CI_COMMIT_BRANCH == "translations"'
-  when: never
-- changes:
-  - content/**/*.lr
-  - templates/**/*
+- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
   script:
 - *apt-template
 - DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y

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

[tor-commits] [tpo/master] update lego

[emmapeel]

commit 9306de762189a8aeae3c0863fee2af5727f63391
Author: emma peel 
Date:   Thu Oct 28 10:15:11 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index c8ed9e1d..c615f285 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit c8ed9e1d9cd895cdfb1a9b18822310b40cc93f58
+Subproject commit c615f285b3ecdde226b02809f2181aeb30ee7ca7

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

[tor-commits] [community/master] more edits for https://gitlab.torproject.org/tpo/web/community/-/issues/234

[emmapeel]

commit dcae59f54a61c43c0a64a0b2c7b63325994e3011
Author: emma peel 
Date:   Wed Oct 27 11:47:43 2021 +0200

more edits for https://gitlab.torproject.org/tpo/web/community/-/issues/234
---
 templates/home.html | 2 +-
 templates/outreach.html | 2 +-
 templates/training.html | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/templates/home.html b/templates/home.html
index f95a873..b81314c 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -14,7 +14,7 @@
 {{ _(child.title) }}
 {{ _(child.subtitle) }}
 
-  
+  
 
   
   {{ 
_(child.cta) }}
diff --git a/templates/outreach.html b/templates/outreach.html
index a640059..4a606f3 100644
--- a/templates/outreach.html
+++ b/templates/outreach.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   
diff --git a/templates/training.html b/templates/training.html
index 39d6df0..c3b5a5b 100644
--- a/templates/training.html
+++ b/templates/training.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   

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

[tor-commits] [community/translations] update translation file

[emmapeel]

commit 191ff713db4ab516013af48e3705726589a1d0d4
Author: emma peel 
Date:   Tue Oct 26 18:54:53 2021 +0200

update translation file
---
 i18n/contents.pot | 1233 -
 1 file changed, 831 insertions(+), 402 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index ec8d99a..f19547e 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-21 11:36+CET\n"
+"POT-Creation-Date: 2021-10-26 18:39+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -3617,6 +3617,8 @@ msgstr ""
 #: (content/relay/setup/bridge/openbsd/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/netbsd/
 #: (content/relay/setup/guard/netbsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/debian-ubuntu/
+#: (content/relay/setup/guard/debian-ubuntu/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/dragonflybsd/
@@ -3629,8 +3631,12 @@ msgstr ""
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/freebsd/
 #: (content/relay/setup/guard/freebsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/centos-rhel/
+#: (content/relay/setup/guard/centos-rhel/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/openbsd/
 #: (content/relay/setup/guard/openbsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/debian-ubuntu/updates/
+#: (content/relay/setup/guard/debian-ubuntu/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/updates/
 #: (content/relay/setup/guard/centosrhel/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/fedora/updates/
@@ -3639,6 +3645,8 @@ msgstr ""
 #: (content/relay/setup/guard/debianubuntu/updates/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/freebsd/updates/
 #: (content/relay/setup/guard/freebsd/updates/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/guard/centos-rhel/updates/
+#: (content/relay/setup/guard/centos-rhel/updates/contents+en.lr:page.body)
 msgid "```"
 msgstr ""
 
@@ -6327,8 +6335,6 @@ msgstr ""
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/debianubuntu/
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "Nickname myNiceRelay"
@@ -6340,8 +6346,6 @@ msgstr ""
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/debianubuntu/
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "ExitRelay 0"
@@ -6372,12 +6376,8 @@ msgstr ""
 #: 
(content/training/resources/tor-relay-workshop/contents+en.lr:slide.description)
 #: https://community.torproject.org/relay/setup/guard/windows/
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/dragonflybsd/
-#: (content/relay/setup/guard/dragonflybsd/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/debianubuntu/
 #: (content/relay/setup/guard/debianubuntu/contents+en.lr:page.body)
 msgid "ContactInfo tor-operator@your-emailaddress-domain"
@@ -6421,8 +6421,6 @@ msgstr ""
 #: (content/relay/setup/guard/windows/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/guard/centosrhel/
 #: (content/relay/setup/guard/centosrhel/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/guard/fedora/
-#: (content/relay/setup/guard/fedora/contents+en.lr:page.body)
 msgid "ORPort 9001"
 msgstr ""
 
@@ -6440,15 +6438,11 @@ msgstr ""
 
 #: https://community.torproject.org/training/resources/tor-relay-workshop/
 #: 

[tor-commits] [community/translations] update lego

[emmapeel]

commit adedc12894be656aa5be7cef94bc5932a9ab9c90
Author: emma peel 
Date:   Tue Oct 26 18:54:40 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 8bbc491..bc96ee5 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 8bbc49137960f1e05654b65cdd65ae298cf5cb20
+Subproject commit bc96ee58985e63529559653e14b42430ad972c10



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

[tor-commits] [community/translations] update contents

[emmapeel]

commit d6d0fc9480ec0ece73ad8989d648f19c1d6d3007
Author: emma peel 
Date:   Tue Oct 26 18:54:31 2021 +0200

update contents
---
 .../community-resources/good-bad-isps/contents.lr  | 11 ++-
 content/relay/setup/guard/centos-rhel/contents.lr  | 95 ++
 .../setup/guard/centos-rhel/updates/contents.lr| 94 +
 .../relay/setup/guard/debian-ubuntu/contents.lr| 62 ++
 .../setup/guard/debian-ubuntu/updates/contents.lr  | 63 ++
 content/relay/setup/guard/dragonflybsd/contents.lr | 61 +++---
 content/relay/setup/guard/fedora/contents.lr   | 35 
 content/relay/setup/guard/freebsd/contents.lr  | 53 ++--
 content/relay/setup/guard/netbsd/contents.lr   | 38 ++---
 content/relay/setup/guard/openbsd/contents.lr  | 61 --
 content/relay/setup/post-install/contents.lr   |  1 +
 templates/home.html|  2 +-
 templates/homepage.html|  4 +-
 templates/localization.html|  4 +-
 templates/two-columns-page.html|  4 +-
 templates/user-research.html   |  2 +-
 16 files changed, 468 insertions(+), 122 deletions(-)

diff --git a/content/relay/community-resources/good-bad-isps/contents.lr 
b/content/relay/community-resources/good-bad-isps/contents.lr
index 455bc47..98026f7 100644
--- a/content/relay/community-resources/good-bad-isps/contents.lr
+++ b/content/relay/community-resources/good-bad-isps/contents.lr
@@ -21,6 +21,8 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
  * Hetzner Online GmbH (AS24940)
  * DigitalOcean, LLC (AS14061)
 
+These hosts already have many tor nodes being hosted there.
+
 **Note**: This page is currently being revamped. If you would like to help out 
please see [#72](https://gitlab.torproject.org/tpo/web/community/-/issues/72).
 
 # Good Experiences
@@ -68,7 +70,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 
|-|-|-|--|-|-||
 | [Online.net](http://www.online.net/) | AS12876 | Yes | Yes | Yes | The 
account holder is responsible for all the traffic going through theirs 
servers.| 01/28/2019 |
 | [Gandi VPS](https://www.gandi.net/) | - | Yes | Yes | Yes| Gandi send some 
abuse complaints to Exit relays, but they do not stop the server, and when you 
tell them your server is a Tor Exit relay, they say it is OK. They ask Exit 
relays to use the standard Reduced Exit Policy | - |
-| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | 
Unmetered bandwidth @ 100mbps - "I will gladly explain this situation for you. 
Running a Tor exit node is strictly forbidden and can lead to the suspension 
and even termination of your server and account." | 09/27/2021 |
+| [OVH Kimsufi](http://www.kimsufi.com/) | AS16276 | Yes | Yes | No | 
Unmetered bandwidth @ 100mbps - "I will gladly explain this situation for you. 
Running a Tor exit node is strictly forbidden and can lead to the suspension 
and even termination of your server and account." Locations: FR,CA | 09/27/2021 
|
 | [Digicube](http://www.digicube.fr/) | - | Yes | Yes | Yes | - | - |
 | [Pulse Servers](http://www.pulseservers.com/) | AS16276 | Yes | Yes | Yes | 
VPS uses OVH AS. You can build ANY kind tor relays. | 09/27/2021 |
 
@@ -96,7 +98,7 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [myLoc Managed IT](https://myloc.de) | AS31010, AS24961 | Yes | Yes | No | - 
| 2018-10-25 |
 | [linevast](https://www.linevast.de) | AS201206 | No | No | No |  | 03/2021 |
 | [Server4You](https://www.server4you.de)| AS131914 | No | No | No | - | 
03/2021 |
-| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good 
dedicated root servers for a good price. Unmetered bandwidth on dedicated 
servers, 20tb on vps. "It is not a Problem, however, abuse reports can lead to 
a server lock" | 09/27/2021 |
+| [Hetzner](http://hetzner.de) | AS24940 | Yes | Yes | Yes | Offers good 
dedicated root servers for a good price. Unmetered bandwidth on dedicated 
servers, 20tb on vps. "It is not a Problem, however, abuse reports can lead to 
a server lock" Locations: DE,FI | 09/27/2021 |
 | [Contabo](https://contabo.de) | AS51167 | No | No | No | Tor prohibited due 
to terms of service | 03/2021 |
 | [Strato](https://strato.de) | AS6724 | No | No | No | - | 03/2021 |
 | [PraHost](https://www.prahost.com) | - | Yes | Yes | Yes | "If there is any 
abuse notice received, you need to solve it in given time, else your IP will be 
blocked until you take any action" | 03/2021 |
@@ -313,9 +315,10 @@ For network diversity and stronger anonymity, you should 
avoid providers and cou
 | [HostHatch](https://hosthatch.com) | AS46562 | Yes | Yes | No | Their vps 
isp are mixed include: QuadraNet, 

[tor-commits] [community/master] update lego

[emmapeel]

commit 7734ee62d821578ed9ea7e349aa589f8373286e6
Author: emma peel 
Date:   Tue Oct 26 18:02:43 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index c8ed9e1..bc96ee5 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit c8ed9e1d9cd895cdfb1a9b18822310b40cc93f58
+Subproject commit bc96ee58985e63529559653e14b42430ad972c10

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

[tor-commits] [community/master] replace section with path to prevent translation. closes https://gitlab.torproject.org/tpo/web/community/-/issues/234

[emmapeel]

commit 325ac819df7962feeca9d542aca0525c9d199410
Author: emma peel 
Date:   Wed Oct 20 21:22:13 2021 +0200

replace section with path to prevent translation. closes 
https://gitlab.torproject.org/tpo/web/community/-/issues/234
---
 templates/home.html | 2 +-
 templates/localization.html | 4 ++--
 templates/two-columns-page.html | 4 ++--
 templates/user-research.html| 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/home.html b/templates/home.html
index b81314c..f95a873 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -14,7 +14,7 @@
 {{ _(child.title) }}
 {{ _(child.subtitle) }}
 
-  
+  
 
   
   {{ 
_(child.cta) }}
diff --git a/templates/localization.html b/templates/localization.html
index 7a17aba..1d0056b 100644
--- a/templates/localization.html
+++ b/templates/localization.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   
@@ -29,7 +29,7 @@
   {{ _('Localization is a continuous process across our applications. 
Notice any improvements we could make to our translations? Open a ticket, reach 
out to us, or become part of our translators squad.') }}
 
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-l10n;>
-  {{ _('Translators mailing list') }}
+  {{ _('Join Tor Translators mailing list') }}
 
   
 
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index d71e970..0f48cfd 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -25,9 +25,9 @@
 
 
   
-
+
 
-  {{ _("Back to previous page: ") }}{{ 
this.parent.title }} - https://github.com/torproject/community/edit/master/content{{ this.path 
}}/contents.lr">{{ _("Edit this page") }}
+  {{ _("Back to previous page: ") }} 
{{ this.parent.title }} - https://github.com/torproject/community/edit/master/content{{ this.path 
}}/contents.lr">{{ _("Edit this page") }}
 
   
 
diff --git a/templates/user-research.html b/templates/user-research.html
index 339cca3..903831a 100644
--- a/templates/user-research.html
+++ b/templates/user-research.html
@@ -4,7 +4,7 @@
   {{ this.body }}
 
 
-  
+  
 
   
   

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

[tor-commits] [gettor-web/translations] update translation file

[emmapeel]

commit d75083cca8c3f8e752a542b570aee4ba4c46
Author: emma peel 
Date:   Fri Oct 22 09:52:48 2021 +0200

update translation file
---
 i18n/contents.pot | 66 ++-
 1 file changed, 51 insertions(+), 15 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 84bfde7..349e8a2 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-22 09:36+CET\n"
+"POT-Creation-Date: 2021-10-22 09:52+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -162,32 +162,28 @@ msgid "Close banner"
 msgstr ""
 
 #: lego/templates/banner.html:11 templates/banner.html:11
-msgid "Use a Mask, Use Tor."
+msgid "Privacy is a human right"
 msgstr ""
 
-#: lego/templates/banner.html:20 templates/banner.html:20
-msgid "Resist the surveillance pandemic."
+#: lego/templates/banner.html:15 templates/banner.html:15
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
 
-#: lego/templates/banner.html:32 templates/banner.html:32
+#: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 
-#: lego/templates/banner.html:38 lego/templates/footer.html:64
-#: lego/templates/footer.html:66 lego/templates/navbar.html:18
-#: lego/templates/navbar.html:20 templates/banner.html:38
-#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
-#: templates/navbar.html:20
-msgid "Donate Now"
+#: lego/templates/banner.html:32 templates/banner.html:32
+msgid "Donate now"
 msgstr ""
 
-#: lego/templates/banner.html:40 templates/banner.html:40
+#: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
 msgstr ""
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
-#: lego/templates/navbar.html:83 templates/footer.html:13
-#: templates/footer.html:22 templates/navbar.html:83
+#: lego/templates/navbar.html:95 templates/footer.html:13
+#: templates/footer.html:22 templates/navbar.html:95
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -209,11 +205,19 @@ msgid ""
 "understanding."
 msgstr ""
 
+#: lego/templates/footer.html:64 lego/templates/footer.html:66
+#: lego/templates/navbar.html:18 lego/templates/navbar.html:20
+#: lego/templates/navbar.html:63 templates/footer.html:64
+#: templates/footer.html:66 templates/navbar.html:18 templates/navbar.html:20
+#: templates/navbar.html:63
+msgid "Donate"
+msgstr ""
+
 #: lego/templates/footer.html:64 lego/templates/footer.html:66
 #: lego/templates/navbar.html:18 lego/templates/navbar.html:20
 #: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
 #: templates/navbar.html:20
-msgid "Donate"
+msgid "Donate Now"
 msgstr ""
 
 #: lego/templates/footer.html:75 templates/footer.html:75
@@ -239,6 +243,38 @@ msgstr ""
 msgid "Menu"
 msgstr ""
 
+#: lego/templates/navbar.html:55 templates/navbar.html:55
+msgid "About"
+msgstr ""
+
+#: lego/templates/navbar.html:56 templates/navbar.html:56
+msgid "Documentation"
+msgstr ""
+
+#: lego/templates/navbar.html:57 templates/navbar.html:57
+msgid "Support"
+msgstr ""
+
+#: lego/templates/navbar.html:58 templates/navbar.html:58
+msgid "Community"
+msgstr ""
+
+#: lego/templates/navbar.html:59 templates/navbar.html:59
+msgid "Blog"
+msgstr ""
+
+#: lego/templates/navbar.html:60 templates/navbar.html:60
+msgid "Jobs"
+msgstr ""
+
+#: lego/templates/navbar.html:61 templates/navbar.html:61
+msgid "Contact"
+msgstr ""
+
+#: lego/templates/navbar.html:62 templates/navbar.html:62
+msgid "Press"
+msgstr ""
+
 #: lego/templates/search.html:5
 msgid "Search"
 msgstr ""

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

[tor-commits] [gettor-web/translations] update lego

[emmapeel]

commit 8a2b15ff11aae1517444106ce7b6f43af3c05184
Author: emma peel 
Date:   Fri Oct 22 09:52:03 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 842b8e9..8bbc491 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 842b8e924653b41b382d9a26eb33ecb4f4638553
+Subproject commit 8bbc49137960f1e05654b65cdd65ae298cf5cb20



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

[tor-commits] [gettor-web/translations] update translation file

[emmapeel]

commit 5d460802b35e9c236c01bce024a1393f7b904762
Author: emma peel 
Date:   Fri Oct 22 09:37:16 2021 +0200

update translation file
---
 i18n/contents.pot | 170 --
 1 file changed, 74 insertions(+), 96 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 7176908..84bfde7 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-04-17 07:56+CET\n"
+"POT-Creation-Date: 2021-10-22 09:36+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -11,94 +11,6 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: (dynamic)
-msgid "Tor Project"
-msgstr ""
-
-#: (dynamic)
-msgid "Donate"
-msgstr ""
-
-#: (dynamic)
-msgid "Donate Now"
-msgstr ""
-
-#: (dynamic)
-msgid "Menu"
-msgstr ""
-
-#: (dynamic)
-msgid "About"
-msgstr ""
-
-#: (dynamic)
-msgid "Documentation"
-msgstr ""
-
-#: (dynamic)
-msgid "Support"
-msgstr ""
-
-#: (dynamic)
-msgid "Community"
-msgstr ""
-
-#: (dynamic)
-msgid "Blog"
-msgstr ""
-
-#: (dynamic)
-msgid "Download Tor Browser"
-msgstr ""
-
-#: (dynamic)
-msgid ""
-"Download Tor Browser to experience real private browsing without tracking, "
-"surveillance, or censorship."
-msgstr ""
-
-#: (dynamic)
-msgid "Our mission:"
-msgstr ""
-
-#: (dynamic)
-msgid ""
-"To advance human rights and freedoms by creating and deploying free and open "
-"source anonymity and privacy technologies, supporting their unrestricted "
-"availability and use, and furthering their scientific and popular "
-"understanding."
-msgstr ""
-
-#: (dynamic)
-msgid "Jobs"
-msgstr ""
-
-#: (dynamic)
-msgid "Contact"
-msgstr ""
-
-#: (dynamic)
-msgid "Press"
-msgstr ""
-
-#: (dynamic)
-msgid "Subscribe to our Newsletter"
-msgstr ""
-
-#: (dynamic)
-msgid "Get monthly updates and opportunities from the Tor Project:"
-msgstr ""
-
-#: (dynamic)
-msgid "Sign up"
-msgstr ""
-
-#: (dynamic)
-msgid ""
-"Trademark, copyright notices, and rules for use by third parties can be "
-"found in our %(link_to_faq)s"
-msgstr ""
-
 #: https://gettor.torproject.org/ (content/contents+en.lr:page.title)
 msgid "What is GetTor?"
 msgstr ""
@@ -133,7 +45,7 @@ msgstr ""
 #: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
 msgid ""
 "- Step 3: Download Tor Browser from one of the providers. When done, check "
-"the integrity of the downloaded files by verifying its signature."
+"the integrity of the downloaded file by verifying its signature."
 msgstr ""
 
 #: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
@@ -206,22 +118,22 @@ msgstr ""
 
 #: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
 msgid ""
-"When you start TorBrowser for the first time you will be asked if you want "
-"to use bridges. To use pluggable transports, click 'Configure' in the Tor "
-"Launcher window that appears when you first run Tor Browser."
+"When you start the Tor Browser for the first time you will be asked if you "
+"want to use bridges. To use pluggable transports, click 'Configure' in the "
+"Tor Launcher window that appears when you first run Tor Browser."
 msgstr ""
 
 #: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
 msgid ""
 "You can also configure pluggable transports while Tor Browser is running by "
 "selecting 'Preferences' from the settings menu to the right of the address "
-"bar. Once in Preferences, navigate to 'Tor Settings' from the menu on the "
-"left of the screen."
+"bar. Once in Preferences, navigate to 'Tor' from the menu on the left of the "
+"screen."
 msgstr ""
 
 #: https://gettor.torproject.org/ (content/contents+en.lr:page.body)
 msgid ""
-"Select 'Tor is censored in my country,' then click 'Select a built-in "
+"On the 'Bridges' section, select 'Use a bridge' and 'Select a built-in "
 "bridge.' Click on the drop-down menu and select the pluggable transport "
 "you'd like to use."
 msgstr ""
@@ -261,10 +173,72 @@ msgstr ""
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 
+#: lego/templates/banner.html:38 lego/templates/footer.html:64
+#: lego/templates/footer.html:66 lego/templates/navbar.html:18
+#: lego/templates/navbar.html:20 templates/banner.html:38
+#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
+#: templates/navbar.html:20
+msgid "Donate Now"
+msgstr ""
+
 #: lego/templates/banner.html:40 templates/banner.html:40
 msgid "DONATE NOW"
 msgstr ""
 
+#: lego/templates/footer.html:13 lego/templates/footer.html:22
+#: lego/templates/navbar.html:83 templates/footer.html:13
+#: templates/footer.html:22 templates/navbar.html:83
+msgid "Download Tor Browser"
+msgstr ""
+
+#: lego/templates/footer.html:14 templates/footer.html:14
+msgid ""
+"Download Tor Browser to experience real private browsing without 

[tor-commits] [gettor-web/translations] update contents

[emmapeel]

commit 0501209a4bf4a2279770515da77e5f439b3df93e
Author: emma peel 
Date:   Fri Oct 22 09:22:16 2021 +0200

update contents
---
 content/contents.lr | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/contents.lr b/content/contents.lr
index 15397de..2bdf161 100644
--- a/content/contents.lr
+++ b/content/contents.lr
@@ -13,7 +13,7 @@ The idea behind GetTor is very simple:
 
 - Step 2: GetTor will send you back a reply with links to download Tor Browser 
from our supported providers.
 
-- Step 3: Download Tor Browser from one of the providers. When done, check the 
integrity of the downloaded files by verifying its signature.
+- Step 3: Download Tor Browser from one of the providers. When done, check the 
integrity of the downloaded file by verifying its signature.
 
 - Step 4: If required, get some bridges!
 
@@ -37,11 +37,11 @@ Bridge relays are Tor relays that are not listed in the 
public Tor directory.
 That means that ISPs or governments trying to block access to the Tor network 
can't simply block all bridges.
 Bridges are useful for Tor users under oppressive regimes, and for people who 
want an extra layer of security because they're worried somebody will recognize 
that they are contacting a public Tor relay IP address.
 
-When you start TorBrowser for the first time you will be asked if you want to 
use bridges. To use pluggable transports, click 'Configure' in the Tor Launcher 
window that appears when you first run Tor Browser.
+When you start the Tor Browser for the first time you will be asked if you 
want to use bridges. To use pluggable transports, click 'Configure' in the Tor 
Launcher window that appears when you first run Tor Browser.
 
-You can also configure pluggable transports while Tor Browser is running by 
selecting 'Preferences' from the settings menu to the right of the address bar. 
Once in Preferences, navigate to 'Tor Settings' from the menu on the left of 
the screen.
+You can also configure pluggable transports while Tor Browser is running by 
selecting 'Preferences' from the settings menu to the right of the address bar. 
Once in Preferences, navigate to 'Tor' from the menu on the left of the screen.
 
-Select 'Tor is censored in my country,' then click 'Select a built-in bridge.' 
Click on the drop-down menu and select the pluggable transport you'd like to 
use.
+On the 'Bridges' section, select 'Use a bridge' and 'Select a built-in 
bridge.' Click on the drop-down menu and select the pluggable transport you'd 
like to use.
 
 Click 'OK' to save your settings.
 

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

[tor-commits] [community/translations] update lego

[emmapeel]

commit 2bb89d5b9a3c586bc796eda39518a680ab943461
Author: emma peel 
Date:   Thu Oct 21 11:42:51 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 96effb7..8bbc491 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 96effb77f3538a99f9b0198d6ff8a63228c5ac37
+Subproject commit 8bbc49137960f1e05654b65cdd65ae298cf5cb20

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

[tor-commits] [community/translations] Update lego

[emmapeel]

commit 5e37c1bb3be7ab07449476144aeb3a5f2ae458b8
Author: gus 
Date:   Tue Oct 12 09:10:33 2021 -0300

Update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 5db6fa6..96effb7 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b
+Subproject commit 96effb77f3538a99f9b0198d6ff8a63228c5ac37



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

[tor-commits] [community/translations] content updates

[emmapeel]

commit b0abebdcea1b6187ba2a1a5ead48890f89986d1b
Author: emma peel 
Date:   Thu Oct 21 10:55:35 2021 +0200

content updates
---
 content/relay/setup/bridge/docker/contents.lr | 6 +-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/content/relay/setup/bridge/docker/contents.lr 
b/content/relay/setup/bridge/docker/contents.lr
index a3d1e0a..a849385 100644
--- a/content/relay/setup/bridge/docker/contents.lr
+++ b/content/relay/setup/bridge/docker/contents.lr
@@ -37,7 +37,11 @@ That's it! Your container is now bootstrapping your new 
obfs4 bridge.
 
 ### 2. Upgrade your container
 
-Upgrading to the latest version of our image is as simple as running:
+Upgrading to the latest version of our image is as simple as pulling the 
latest version of the image running:
+
+`docker-compose pull obfs4-bridge`
+
+And then restarting the container:
 
 `docker-compose up -d obfs4-bridge`
 



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

[tor-commits] [community/translations] update translation file

[emmapeel]

commit 53e1dd4c44cae6be90b68224fac2d2a9a697d539
Author: emma peel 
Date:   Thu Oct 21 11:41:17 2021 +0200

update translation file
---
 i18n/contents.pot | 41 -
 1 file changed, 28 insertions(+), 13 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 2019bb2..ec8d99a 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-11 07:32+CET\n"
+"POT-Creation-Date: 2021-10-21 11:36+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -16246,7 +16246,19 @@ msgstr ""
 
 #: https://community.torproject.org/relay/setup/bridge/docker/
 #: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
-msgid "Upgrading to the latest version of our image is as simple as running:"
+msgid ""
+"Upgrading to the latest version of our image is as simple as pulling the "
+"latest version of the image running:"
+msgstr ""
+
+#: https://community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
+msgid "`docker-compose pull obfs4-bridge`"
+msgstr ""
+
+#: https://community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
+msgid "And then restarting the container:"
 msgstr ""
 
 #: https://community.torproject.org/relay/setup/bridge/docker/
@@ -18286,26 +18298,22 @@ msgid "Close banner"
 msgstr ""
 
 #: lego/templates/banner.html:11 templates/banner.html:11
-msgid "Use a Mask, Use Tor."
+msgid "Privacy is a human right"
 msgstr ""
 
-#: lego/templates/banner.html:20 templates/banner.html:20
-msgid "Resist the surveillance pandemic."
+#: lego/templates/banner.html:15 templates/banner.html:15
+msgid "Your donation will be matched by Friends of Tor, up to $150,000."
 msgstr ""
 
-#: lego/templates/banner.html:32 templates/banner.html:32
+#: lego/templates/banner.html:26 templates/banner.html:26
 msgid "Your donation will be matched by Friends of Tor, up to $100,000."
 msgstr ""
 
-#: lego/templates/banner.html:38 lego/templates/footer.html:64
-#: lego/templates/footer.html:66 lego/templates/navbar.html:18
-#: lego/templates/navbar.html:20 templates/banner.html:38
-#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
-#: templates/navbar.html:20
-msgid "Donate Now"
+#: lego/templates/banner.html:32 templates/banner.html:32
+msgid "Donate now"
 msgstr ""
 
-#: lego/templates/banner.html:40 templates/banner.html:40
+#: lego/templates/banner.html:34 templates/banner.html:34
 msgid "DONATE NOW"
 msgstr ""
 
@@ -18341,6 +18349,13 @@ msgstr ""
 msgid "Donate"
 msgstr ""
 
+#: lego/templates/footer.html:64 lego/templates/footer.html:66
+#: lego/templates/navbar.html:18 lego/templates/navbar.html:20
+#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
+#: templates/navbar.html:20
+msgid "Donate Now"
+msgstr ""
+
 #: lego/templates/footer.html:75 templates/footer.html:75
 msgid "Subscribe to our Newsletter"
 msgstr ""

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

[tor-commits] [donate-static/staging] new gitlabci

[emmapeel]

commit f6cb46cbb0b361203a7af41ca494828cbf6fd73a
Author: emma peel 
Date:   Wed Oct 20 19:23:02 2021 +0200

new gitlabci
---
 .gitlab-ci.yml | 118 +
 1 file changed, 118 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index ..16951072
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,118 @@
+image: debian:buster-slim
+
+
+# This template should be usable on any system that's based on apt.
+# taken from tor gitlabci
+
+.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
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  TRANSLATION_BRANCH: "donate-static-contentspot"
+
+
+stages:
+- build
+- test_l10n
+
+pages:
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - .cache/pip
+  - .cache/lektor/builds/
+  stage: build
+  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 apt-utils ca-certificates -y
+- pip3 install virtualenv
+- virtualenv venv
+- source venv/bin/activate
+- pip3 install lektor
+- echo 'checking out translations'
+- rm -rf i18n
+- git clone --branch $TRANSLATION_BRANCH 
https://git.torproject.org/translation.git i18n
+- echo 'reinstall lektor plugins'
+- lektor project-info --output-path
+- lektor plugins reinstall
+- echo 'building lektor 3 more times to get translations in place'
+- lektor build --output-path public && lektor build --output-path public 
&& lektor build --output-path public
+  artifacts:
+paths:
+  - public
+  - i18n
+  rules:
+- when: always
+
+check_new_strings:
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - .cache/pip
+
+  stage: test_l10n
+  needs: [pages]
+  allow_failure: true
+  rules:
+- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+- if: '$CI_COMMIT_BRANCH == "translations"'
+  when: never
+- changes:
+  - content/**/*.lr
+  - templates/**/*
+  script:
+- *apt-template
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y
+- git clone https://gitlab.torproject.org/tpo/community/l10n.git
+- echo 'lets see if there are any updates in the strings for translation'
+- l10n/bin/check_po_status.py $TRANSLATION_BRANCH
+  artifacts:
+paths:
+  - public
+  - i18n
+  - l10n
+
+check_l10n:
+  allow_failure: true
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - i18n
+  - .cache/pip
+  stage: test_l10n
+  needs: [pages]
+  only:
+- translations
+  script:
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector 
python3-polib ca-certificates -y
+- echo 'lets see if there are any broken links on the translations'
+- l10n/bin/check_markdown_links.py i18n/
+

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

[tor-commits] [donate-static/master] new gitlabci

[emmapeel]

commit 4b2c7e7d6e6010e1e470a10257eef1830dbda59a
Author: emma peel 
Date:   Wed Oct 20 19:23:02 2021 +0200

new gitlabci
---
 .gitlab-ci.yml | 118 +
 1 file changed, 118 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index ..16951072
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,118 @@
+image: debian:buster-slim
+
+
+# This template should be usable on any system that's based on apt.
+# taken from tor gitlabci
+
+.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
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  TRANSLATION_BRANCH: "donate-static-contentspot"
+
+
+stages:
+- build
+- test_l10n
+
+pages:
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - .cache/pip
+  - .cache/lektor/builds/
+  stage: build
+  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 apt-utils ca-certificates -y
+- pip3 install virtualenv
+- virtualenv venv
+- source venv/bin/activate
+- pip3 install lektor
+- echo 'checking out translations'
+- rm -rf i18n
+- git clone --branch $TRANSLATION_BRANCH 
https://git.torproject.org/translation.git i18n
+- echo 'reinstall lektor plugins'
+- lektor project-info --output-path
+- lektor plugins reinstall
+- echo 'building lektor 3 more times to get translations in place'
+- lektor build --output-path public && lektor build --output-path public 
&& lektor build --output-path public
+  artifacts:
+paths:
+  - public
+  - i18n
+  rules:
+- when: always
+
+check_new_strings:
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - .cache/pip
+
+  stage: test_l10n
+  needs: [pages]
+  allow_failure: true
+  rules:
+- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+- if: '$CI_COMMIT_BRANCH == "translations"'
+  when: never
+- changes:
+  - content/**/*.lr
+  - templates/**/*
+  script:
+- *apt-template
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y
+- git clone https://gitlab.torproject.org/tpo/community/l10n.git
+- echo 'lets see if there are any updates in the strings for translation'
+- l10n/bin/check_po_status.py $TRANSLATION_BRANCH
+  artifacts:
+paths:
+  - public
+  - i18n
+  - l10n
+
+check_l10n:
+  allow_failure: true
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - i18n
+  - .cache/pip
+  stage: test_l10n
+  needs: [pages]
+  only:
+- translations
+  script:
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector 
python3-polib ca-certificates -y
+- echo 'lets see if there are any broken links on the translations'
+- l10n/bin/check_markdown_links.py i18n/
+

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

[tor-commits] [community/master] i #233: Update NYTimes onion

[emmapeel]

commit 135fe85b056d863bb4567b61864c476a7134aaa7
Author: HackerNCoder 
Date:   Sat Oct 16 17:25:39 2021 +

i #233: Update NYTimes onion
closes: https://gitlab.torproject.org/tpo/web/community/-/issues/233
---
 databags/onions.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/databags/onions.ini b/databags/onions.ini
index 5f1470b..d00380f 100644
--- a/databags/onions.ini
+++ b/databags/onions.ini
@@ -4,7 +4,7 @@ image = /static/images/onions/png/propublica.png
 label = ProPublica
 
 [nytimes]
-link = https://www.nytimes3xbfgragh.onion
+link = 
https://www.nytimesn7cgmftshazwhfgzm37qxb44r64ytbb2dj3x62d2lljsciiyd.onion
 image = /static/images/onions/png/nytimes.png
 label = The New York Times
 

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

[tor-commits] [manual/master] add dynamic string to the translation file

[emmapeel]

commit 75c8551e96d1b7564dc78163bd9b04fc13b0ccd8
Author: emma peel 
Date:   Fri Oct 15 09:24:34 2021 +0200

add dynamic string to the translation file
---
 content/menu/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/menu/contents.lr b/content/menu/contents.lr
index ac004f1..9a82bf3 100644
--- a/content/menu/contents.lr
+++ b/content/menu/contents.lr
@@ -36,4 +36,4 @@ Mobile Tor
 Becoming a Tor Translator
 Making Tor Browser Portable
 Installation
-
+PrivChat

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

[tor-commits] [manual/translations] update lego

[emmapeel]

commit ff1dbaaa658c3c84578b2ec28f2e7e82712e4c22
Author: emma peel 
Date:   Fri Oct 15 09:17:31 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 1e20c72..96effb7 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8
+Subproject commit 96effb77f3538a99f9b0198d6ff8a63228c5ac37

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

[tor-commits] [manual/master] this sentence is not part of the previous list

[emmapeel]

commit 56d577e95045a759c7c71f39552d9583d84a6757
Author: emma peel 
Date:   Fri Oct 15 08:13:17 2021 +0200

this sentence is not part of the previous list
---
 content/installation/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/installation/contents.lr b/content/installation/contents.lr
index adaf3e8..86432f4 100644
--- a/content/installation/contents.lr
+++ b/content/installation/contents.lr
@@ -73,7 +73,7 @@ To change this behavior and launch Tor Browser instead, 
follow this:
 
**Note:** If this command fails to run, you probably need to make the file 
executable. From within this directory run: `chmod +x start-tor-browser.desktop`
 
-* Some additional flags that can be used with `start-tor-browser.desktop` from 
the command-line:
+Some additional flags that can be used with `start-tor-browser.desktop` from 
the command-line:
 
 | **Flag** | **Description** |
 |--|-|

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

[tor-commits] [manual/master] always prefer relative links

[emmapeel]

commit ee71ac6fdce372e464062331e100afcdc0697c31
Author: emma peel 
Date:   Tue Oct 12 14:13:30 2021 +0200

always prefer relative links
---
 content/installation/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/installation/contents.lr b/content/installation/contents.lr
index 18f54bf..adaf3e8 100644
--- a/content/installation/contents.lr
+++ b/content/installation/contents.lr
@@ -84,4 +84,4 @@ To change this behavior and launch Tor Browser instead, 
follow this:
 | `--unregister-app` | To unregister Tor Browser as a desktop application. |
 
 
-See here on how to [update Tor 
Browser](https://tb-manual.torproject.org/updating/).
+See here on how to [update Tor Browser](../updating/).

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

[tor-commits] [community/translations] update translation file

[emmapeel]

commit 67285f12695ce640e413d4d28bb9c94ce09b794b
Author: emma peel 
Date:   Mon Oct 11 08:00:42 2021 +0200

update translation file
---
 i18n/contents.pot | 40 +++-
 1 file changed, 23 insertions(+), 17 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 90d256b..2019bb2 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-10 00:17+CET\n"
+"POT-Creation-Date: 2021-10-11 07:32+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -18310,8 +18310,8 @@ msgid "DONATE NOW"
 msgstr ""
 
 #: lego/templates/footer.html:13 lego/templates/footer.html:22
-#: lego/templates/navbar.html:83 templates/footer.html:13
-#: templates/footer.html:22 templates/navbar.html:83
+#: lego/templates/navbar.html:95 templates/footer.html:13
+#: templates/footer.html:22 templates/navbar.html:95
 msgid "Download Tor Browser"
 msgstr ""
 
@@ -18335,8 +18335,9 @@ msgstr ""
 
 #: lego/templates/footer.html:64 lego/templates/footer.html:66
 #: lego/templates/navbar.html:18 lego/templates/navbar.html:20
-#: templates/footer.html:64 templates/footer.html:66 templates/navbar.html:18
-#: templates/navbar.html:20
+#: lego/templates/navbar.html:63 templates/footer.html:64
+#: templates/footer.html:66 templates/navbar.html:18 templates/navbar.html:20
+#: templates/navbar.html:63
 msgid "Donate"
 msgstr ""
 
@@ -18363,33 +18364,38 @@ msgstr ""
 msgid "Menu"
 msgstr ""
 
-#: lego/templates/navbar.html:86 templates/home.html:31
-#: templates/navbar.html:86
+#: lego/templates/navbar.html:55 templates/home.html:31
+#: templates/navbar.html:55
 msgid "About"
 msgstr ""
 
-#: lego/templates/navbar.html:87 templates/home.html:32
-#: templates/navbar.html:87
+#: lego/templates/navbar.html:56 templates/home.html:32
+#: templates/navbar.html:56
 msgid "Documentation"
 msgstr ""
 
-#: lego/templates/navbar.html:88 templates/home.html:33
-#: templates/navbar.html:88
+#: lego/templates/navbar.html:57 templates/home.html:33
+#: templates/navbar.html:57
 msgid "Support"
 msgstr ""
 
-#: lego/templates/navbar.html:89 templates/home.html:34
-#: templates/navbar.html:89
+#: lego/templates/navbar.html:59 templates/home.html:35
+#: templates/navbar.html:59
+msgid "Blog"
+msgstr ""
+
+#: lego/templates/navbar.html:60 templates/home.html:34
+#: templates/navbar.html:60
 msgid "Jobs"
 msgstr ""
 
-#: lego/templates/navbar.html:90 templates/home.html:35
-#: templates/navbar.html:90
+#: lego/templates/navbar.html:61 templates/home.html:36
+#: templates/navbar.html:61
 msgid "Contact"
 msgstr ""
 
-#: lego/templates/navbar.html:91 templates/home.html:36
-#: templates/navbar.html:91
+#: lego/templates/navbar.html:62 templates/home.html:37
+#: templates/navbar.html:62
 msgid "Press"
 msgstr ""
 

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

[tor-commits] [community/master] add Turkish for website. closes: https://gitlab.torproject.org/tpo/web/community/-/issues/231

[emmapeel]

commit 2245bc36c49575bbfecc57a3fef418a534853623
Author: emma peel 
Date:   Mon Oct 11 06:58:37 2021 +0200

add Turkish for website. closes: 
https://gitlab.torproject.org/tpo/web/community/-/issues/231
---
 .htaccess | 4 ++--
 community.lektorproject   | 5 +
 configs/i18n.ini  | 2 +-
 databags/alternatives.ini | 6 ++
 4 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.htaccess b/.htaccess
index 1e7a96d..93d6f93 100644
--- a/.htaccess
+++ b/.htaccess
@@ -19,5 +19,5 @@ RewriteRule ^ga-IE/(.*) /ga$1 [R=302,L]
 # but don't have a community page
 # You can see them at https://dist.torproject.org/torbrowser/, pick the last 
alpha for the most languages
 # this languages are the translation priority for the community portal!
-RewriteRule 
^(ar|ca|cs|da|de|el|fa|fr|ga|he|hu|id|is|it|ja|ka|ko|lt|mk|ms|nb-NO|nl|pl|pt-BR|pt-PT|ro|ru|sv-SE|th|tr|vi|zh-CN|zh-TW)$
 / [R=302,L]
-RewriteRule 
^(ar|ca|cs|da|de|el|fa|fr|ga|he|hu|id|is|it|ja|ka|ko|lt|mk|ms|nb-NO|nl|pl|pt-BR|pt-PT|ro|ru|sv-SE|th|tr|vi|zh-CN|zh-TW)/(.*)
 /$2 [R=302,L]
+RewriteRule 
^(ar|ca|cs|da|de|el|fa|fr|ga|he|hu|id|is|it|ja|ka|ko|lt|mk|ms|nb-NO|nl|pl|pt-BR|pt-PT|ro|ru|sv-SE|th|vi|zh-CN|zh-TW)$
 / [R=302,L]
+RewriteRule 
^(ar|ca|cs|da|de|el|fa|fr|ga|he|hu|id|is|it|ja|ka|ko|lt|mk|ms|nb-NO|nl|pl|pt-BR|pt-PT|ro|ru|sv-SE|th|vi|zh-CN|zh-TW)/(.*)
 /$2 [R=302,L]
diff --git a/community.lektorproject b/community.lektorproject
index b933b44..4a2adfe 100644
--- a/community.lektorproject
+++ b/community.lektorproject
@@ -15,3 +15,8 @@ name = Español (es)
 primary = yes
 url_prefix = /es/
 locale = es
+
+[alternatives.tr]
+name = Türkçe (tr)
+url_prefix = /tr/
+locale = tr
diff --git a/configs/i18n.ini b/configs/i18n.ini
index 53c9865..933da87 100644
--- a/configs/i18n.ini
+++ b/configs/i18n.ini
@@ -1,5 +1,5 @@
 content = en
-translations = es
+translations = es, tr
 i18npath = i18n
 translate_paragraphwise = False
 url_prefix = https://community.torproject.org/
diff --git a/databags/alternatives.ini b/databags/alternatives.ini
index 774371b..e3d4bcb 100644
--- a/databags/alternatives.ini
+++ b/databags/alternatives.ini
@@ -9,3 +9,9 @@ direction = text-left
 order = order-last
 url = /es/
 language = Español (es)
+
+[tr]
+direction = text-left
+order = order-last
+url = /tr/
+language = Türkçe (tr)

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

[tor-commits] [community/translations] update readme to main version

[emmapeel]

commit 4b3d2df329d3b19df7fa08c18de5f8659d1ac1f2
Author: emma peel 
Date:   Sun Oct 10 12:13:47 2021 +0200

update readme to main version
---
 README.md   | 11 +--
 templates/home.html |  1 +
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.md b/README.md
index d0d917a..d1d09e7 100644
--- a/README.md
+++ b/README.md
@@ -1,19 +1,18 @@
 # Community portal
 
-This is the repository of Community portal. The current online version of this 
portal can be found at https://community.torproject.org or [Community Onion 
Service](http://3gldbgtv5e4god56.onion/).
+This is the repository of Community portal. The current online version of this 
portal can be found at https://community.torproject.org or [Community Onion 
Service](http://xmrhfasfg5suueegrnc4gsgyi2tyclcy5oz7f5drnrodmdtob6t2ioyd.onion/).
 
 To clone the code use either of 
 
 ```git clone https://git.torproject.org/project/web/community.git/```
 
-```torify git clone 
http://dccbbv6cooddgcrq.onion/project/web/community.git/``` 
+```torify git clone 
http://xtlfhaspqtkeeqxk6umggfbr3gyfznvf4jhrge2fujz53433i2fcs3id.onion/project/web/community.git/```
 
 
-or browse it [online](http://gitweb.torproject.org/project/web/community.git).
+or browse it 
[online](http://gzgme7ov25seqjbphab4fkcph3jkobfwwpivt5kzbv3kqx2y2qttl4yd.onion/project/web/community).
 
 ## How to report bugs or feedback 
 
-First check if your issue wasn't already opened in 
[gitlab.torproject.org](https://gitlab.torproject.org/web/community/issues), 
then file a [trac ticket](https://trac.torproject.org/projects/tor/newticket) 
and choose the component: Webpages/Community. 
-
+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
 
@@ -51,7 +50,7 @@ To just build the website once: ```$ lektor build -O 
```
 
  How to develop on the website
 
-Check our [wiki 
pages](https://gitlab.torproject.org/web/community/wikis/How-to-develop-on-the-website).
+Check our [wiki 
pages](https://gitlab.torproject.org/tpo/web/wiki/-/wikis/How-to-develop-on-the-website).
 
 ### Translations
 
diff --git a/templates/home.html b/templates/home.html
index 06d0724..b81314c 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -32,6 +32,7 @@
{{ _("Documentation") }}
{{ _("Support") }}
{{ _("Jobs") }}
+   {{ _("Blog") }}
{{ _("Contact") }}
{{ _("Press") }}
 -->

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

[tor-commits] [community/translations] update lego

[emmapeel]

commit 03e5874ef84f95ad550feac0757269c484b1d2ca
Author: emma peel 
Date:   Sun Oct 10 12:12:48 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 1e20c72..5db6fa6 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8
+Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b



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

[tor-commits] [community/translations] update ci file from master

[emmapeel]

commit 02c13dc0b34172d5e0e9e0ecb196c6606b79d59b
Author: emma peel 
Date:   Sun Oct 10 11:08:30 2021 +0200

update ci file from master
---
 .gitlab-ci.yml | 89 +-
 1 file changed, 75 insertions(+), 14 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7a4f93f..e753821 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,11 +1,5 @@
 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
@@ -27,31 +21,98 @@ cache:
   apt-get upgrade -qy
 
 variables:
-GIT_SUBMODULE_STRATEGY: recursive
+  GIT_SUBMODULE_STRATEGY: recursive
+  PIP_CACHE_DIR: "$CI_PROJECT_DIR/.cache/pip"
+  TRANSLATION_BRANCH: "communitytpo-contentspot"
+
+
+stages:
+- build
+- test_l10n
 
 pages:
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - .cache/pip
+  - .cache/lektor/builds/
+  stage: build
   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
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext python3-babel 
python3-pip git python3-inifile python3-dev python3-setuptools python3-openssl 
python3-cryptography i18nspector apt-utils ca-certificates -y
 - pip3 install virtualenv
 - virtualenv venv
 - source venv/bin/activate
 - pip3 install lektor
 - echo 'checking out translations'
 - rm -rf i18n
-- git clone --branch communitytpo-contentspot 
https://git.torproject.org/translation.git i18n
-- git clone https://gitlab.torproject.org/tpo/community/l10n.git
-- pip3 install polib
-- echo 'reinstalling plugins to have last version'
+- git clone --branch $TRANSLATION_BRANCH 
https://git.torproject.org/translation.git i18n
+- echo 'reinstall lektor plugins'
+- lektor project-info --output-path
 - lektor plugins reinstall
-- echo 'building lektor 3 times to get translations in place'
+- echo 'building lektor 3 more times to get translations in place'
 - lektor build --output-path public && lektor build --output-path public 
&& lektor build --output-path public
+  artifacts:
+paths:
+  - public
+  - i18n
+  rules:
+- when: always
+
+check_new_strings:
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - .cache/pip
+
+  stage: test_l10n
+  needs: [pages]
+  allow_failure: true
+  rules:
+- if: '$CI_PIPELINE_SOURCE == "merge_request_event"'
+- if: $CI_COMMIT_REF_NAME == $CI_DEFAULT_BRANCH
+- if: '$CI_COMMIT_BRANCH == "translations"'
+  when: never
+- changes:
+  - content/**/*.lr
+  - templates/**/*
+  script:
+- *apt-template
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext git python3-dev 
python3-setuptools i18nspector python3-polib python3-requests ca-certificates 
apt-utils -y
+- git clone https://gitlab.torproject.org/tpo/community/l10n.git
 - echo 'lets see if there are any updates in the strings for translation'
-- l10n/bin/check_po_status.py communitytpo-contentspot
+- l10n/bin/check_po_status.py $TRANSLATION_BRANCH
   artifacts:
 paths:
   - public
+  - i18n
+  - l10n
 
 check_l10n:
+  allow_failure: true
+  cache:
+key: $CI_PROJECT_PATH_SLUG.${CI_COMMIT_REF_SLUG}
+paths:
+  - packages
+  - lego
+  - apt-cache
+  - venv
+  - i18n
+  - .cache/pip
+  stage: test_l10n
+  needs: [pages]
+  only:
+- translations
   script:
+- DEBIAN_FRONTEND=noninteractive apt-get install gettext i18nspector 
python3-polib ca-certificates -y
+- echo 'lets see if there are any broken links on the translations'
 - l10n/bin/check_markdown_links.py i18n/
+

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

[tor-commits] [community/master] update lego

[emmapeel]

commit e77f70e254672253dda93431b4ac0773a2e71bb3
Author: emma peel 
Date:   Sun Oct 10 08:13:07 2021 +0200

update lego
---
 lego | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lego b/lego
index 1e20c72..5db6fa6 16
--- a/lego
+++ b/lego
@@ -1 +1 @@
-Subproject commit 1e20c72f727c838806183f2cbee300c96e686eb8
+Subproject commit 5db6fa6df1871a3ded1ba00530fccbb2cd74b87b



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

[tor-commits] [community/master] add strings of menus on top and bottom for l10n

[emmapeel]

commit 019ec161b7ef84392d7625d6cd9a6ba5a1b3d057
Author: emma peel 
Date:   Sun Oct 10 00:20:00 2021 +0200

add strings of menus on top and bottom for l10n
---
 templates/home.html | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/templates/home.html b/templates/home.html
index 09449f0..06d0724 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -25,3 +25,13 @@
 
   
 
+



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

[tor-commits] [community/master] add forgotten menu item

[emmapeel]

commit ee7d1d8412584f98431b506a16095779a0ef7ddc
Author: emma peel 
Date:   Sun Oct 10 11:06:40 2021 +0200

add forgotten menu item
---
 templates/home.html | 1 +
 1 file changed, 1 insertion(+)

diff --git a/templates/home.html b/templates/home.html
index 06d0724..b81314c 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -32,6 +32,7 @@
{{ _("Documentation") }}
{{ _("Support") }}
{{ _("Jobs") }}
+   {{ _("Blog") }}
{{ _("Contact") }}
{{ _("Press") }}
 -->

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

[tor-commits] [community/translations] add strings of menus on top and bottom for l10n

[emmapeel]

commit 190785be1d6e4a512d895ceed29f9e0bfe73fba7
Author: emma peel 
Date:   Sun Oct 10 00:20:00 2021 +0200

add strings of menus on top and bottom for l10n
---
 templates/home.html | 10 ++
 1 file changed, 10 insertions(+)

diff --git a/templates/home.html b/templates/home.html
index 09449f0..06d0724 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -25,3 +25,13 @@
 
   
 
+

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

[tor-commits] [community/translations] add menu strings

[emmapeel]

commit 34ca8aefb9f206a7e949bec3f9d789552004ceba
Author: emma peel 
Date:   Sun Oct 10 00:03:13 2021 +0200

add menu strings
---
 i18n/contents.pot | 30 +++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index c6a3aac..4d97efd 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-09 20:29+CET\n"
+"POT-Creation-Date: 2021-10-09 23:31+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -1881,7 +1881,7 @@ msgstr ""
 #: (content/training/best-practices/contents+en.lr:page.body)
 msgid ""
 "8. Decide how you will facilitate a safer space. We recommend using the [Tor "
-"Code of Conduct](../training/code-of-conduct/)."
+"Code of Conduct](../code-of-conduct/)."
 msgstr ""
 
 #: https://community.torproject.org/training/best-practices/
@@ -1932,7 +1932,7 @@ msgstr ""
 #: https://community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lr:page.body)
 msgid ""
-"6. Show the participants the retources at [community.torproject.org](/) and "
+"6. Show the participants the resources at [community.torproject.org](/) and "
 "[support.torproject.org](https://support.torproject.org)."
 msgstr ""
 
@@ -18363,6 +18363,30 @@ msgstr ""
 msgid "Menu"
 msgstr ""
 
+#: lego/templates/navbar.html:86 templates/navbar.html:86
+msgid "About"
+msgstr ""
+
+#: lego/templates/navbar.html:87 templates/navbar.html:87
+msgid "Documentation"
+msgstr ""
+
+#: lego/templates/navbar.html:88 templates/navbar.html:88
+msgid "Support"
+msgstr ""
+
+#: lego/templates/navbar.html:89 templates/navbar.html:89
+msgid "Jobs"
+msgstr ""
+
+#: lego/templates/navbar.html:90 templates/navbar.html:90
+msgid "Contact"
+msgstr ""
+
+#: lego/templates/navbar.html:91 templates/navbar.html:91
+msgid "Press"
+msgstr ""
+
 #: lego/templates/search.html:5
 msgid "Search"
 msgstr ""



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

[tor-commits] [community/translations] update templates translation

[emmapeel]

commit 19a14f25038d45747bc9a895b5813c3987a9014b
Author: emma peel 
Date:   Sun Oct 10 00:17:56 2021 +0200

update templates translation
---
 i18n/contents.pot | 20 +---
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 4d97efd..90d256b 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-09 23:31+CET\n"
+"POT-Creation-Date: 2021-10-10 00:17+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -18363,27 +18363,33 @@ msgstr ""
 msgid "Menu"
 msgstr ""
 
-#: lego/templates/navbar.html:86 templates/navbar.html:86
+#: lego/templates/navbar.html:86 templates/home.html:31
+#: templates/navbar.html:86
 msgid "About"
 msgstr ""
 
-#: lego/templates/navbar.html:87 templates/navbar.html:87
+#: lego/templates/navbar.html:87 templates/home.html:32
+#: templates/navbar.html:87
 msgid "Documentation"
 msgstr ""
 
-#: lego/templates/navbar.html:88 templates/navbar.html:88
+#: lego/templates/navbar.html:88 templates/home.html:33
+#: templates/navbar.html:88
 msgid "Support"
 msgstr ""
 
-#: lego/templates/navbar.html:89 templates/navbar.html:89
+#: lego/templates/navbar.html:89 templates/home.html:34
+#: templates/navbar.html:89
 msgid "Jobs"
 msgstr ""
 
-#: lego/templates/navbar.html:90 templates/navbar.html:90
+#: lego/templates/navbar.html:90 templates/home.html:35
+#: templates/navbar.html:90
 msgid "Contact"
 msgstr ""
 
-#: lego/templates/navbar.html:91 templates/navbar.html:91
+#: lego/templates/navbar.html:91 templates/home.html:36
+#: templates/navbar.html:91
 msgid "Press"
 msgstr ""
 

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

[tor-commits] [community/translations] correct link

[emmapeel]

commit ebeb6e270764efd964b232b2c4d31136a5fa1dae
Author: emma peel 
Date:   Sat Oct 9 21:30:53 2021 +0200

correct link
---
 content/training/best-practices/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/training/best-practices/contents.lr 
b/content/training/best-practices/contents.lr
index 43b83b5..31cf26a 100644
--- a/content/training/best-practices/contents.lr
+++ b/content/training/best-practices/contents.lr
@@ -51,7 +51,7 @@ Once you've answered those questions, you're ready to plan 
your training!
Will you be able to handle this alone? Or will you require partners?
If you need more help, make sure the partners you're bringing in are aware 
of the safety needs of the community, and communicate with your contacts in the 
community to make sure they're okay with you bringing in additional trainers.
 7. Make sure your presentation is up-to-date (both information and 
screenshots) and save your presentation in two file formats -- for example, odp 
and pdf -- and on at least one additional device -- for example, on your 
computer and on a USB stick.
-8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](../training/code-of-conduct/).
+8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](../code-of-conduct/).
 
 You can also start the training by asking participants to come up with their 
own community agreements for the space.
 



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

[tor-commits] [community/master] correct link

[emmapeel]

commit 8a51aa47308280189898991c1cfacc3bf3bf1e11
Author: emma peel 
Date:   Sat Oct 9 21:30:53 2021 +0200

correct link
---
 content/training/best-practices/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/training/best-practices/contents.lr 
b/content/training/best-practices/contents.lr
index 43b83b5..31cf26a 100644
--- a/content/training/best-practices/contents.lr
+++ b/content/training/best-practices/contents.lr
@@ -51,7 +51,7 @@ Once you've answered those questions, you're ready to plan 
your training!
Will you be able to handle this alone? Or will you require partners?
If you need more help, make sure the partners you're bringing in are aware 
of the safety needs of the community, and communicate with your contacts in the 
community to make sure they're okay with you bringing in additional trainers.
 7. Make sure your presentation is up-to-date (both information and 
screenshots) and save your presentation in two file formats -- for example, odp 
and pdf -- and on at least one additional device -- for example, on your 
computer and on a USB stick.
-8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](../training/code-of-conduct/).
+8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](../code-of-conduct/).
 
 You can also start the training by asking participants to come up with their 
own community agreements for the space.
 

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

[tor-commits] [community/master] typo

[emmapeel]

commit a748d3a2a76376037ab58f7d7d3c380105ac0a47
Author: emma peel 
Date:   Sat Oct 9 20:54:49 2021 +0200

typo
---
 content/training/best-practices/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/training/best-practices/contents.lr 
b/content/training/best-practices/contents.lr
index c3c87a8..43b83b5 100644
--- a/content/training/best-practices/contents.lr
+++ b/content/training/best-practices/contents.lr
@@ -62,7 +62,7 @@ You can also start the training by asking participants to 
come up with their own
 3. Communicate about when you'll take questions, either during the training, 
at the end, or both.
 4. Communicate about how you'll offer hands-on help (if at all).
 5. Communicate about how participants can contact you securely after the 
training.
-6. Show the participants the retources at [community.torproject.org](/) and 
[support.torproject.org](https://support.torproject.org).
+6. Show the participants the resources at [community.torproject.org](/) and 
[support.torproject.org](https://support.torproject.org).
 7. Show the participants other resources like 
[sec.eff.org](https://sec.eff.org).
 
 ## After the training

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

[tor-commits] [community/translations] update translation file

[emmapeel]

commit cd7830bab18f2d47dc19df062046de19e6ce3d7f
Author: emma peel 
Date:   Sat Oct 9 20:55:20 2021 +0200

update translation file
---
 i18n/contents.pot | 66 ++-
 1 file changed, 31 insertions(+), 35 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index d26ddec..c6a3aac 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-09 18:52+CET\n"
+"POT-Creation-Date: 2021-10-09 20:29+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -1881,7 +1881,7 @@ msgstr ""
 #: (content/training/best-practices/contents+en.lr:page.body)
 msgid ""
 "8. Decide how you will facilitate a safer space. We recommend using the [Tor "
-"Code of Conduct](/training/code-of-conduct/)."
+"Code of Conduct](../training/code-of-conduct/)."
 msgstr ""
 
 #: https://community.torproject.org/training/best-practices/
@@ -1932,9 +1932,8 @@ msgstr ""
 #: https://community.torproject.org/training/best-practices/
 #: (content/training/best-practices/contents+en.lr:page.body)
 msgid ""
-"6. Show the participants the resources at [community.torproject.org](https://;
-"community.torproject.org) and [support.torproject.org](https://support.;
-"torproject.org)."
+"6. Show the participants the retources at [community.torproject.org](/) and "
+"[support.torproject.org](https://support.torproject.org)."
 msgstr ""
 
 #: https://community.torproject.org/training/best-practices/
@@ -3186,9 +3185,8 @@ msgstr ""
 #: https://community.torproject.org/onion-services/talk/
 #: (content/onion-services/talk/contents+en.lr:page.body)
 msgid ""
-"As explained in [Overview](https://community.torproject.org/onion-services/;
-"overview/), there's no central authority that approves or rejects onion "
-"services."
+"As explained in [Overview](../overview/), there's no central authority that "
+"approves or rejects onion services."
 msgstr ""
 
 #: https://community.torproject.org/onion-services/talk/
@@ -15369,14 +15367,36 @@ msgstr ""
 msgid "### 5. Final Notes"
 msgstr ""
 
+#: https://community.torproject.org/relay/setup/bridge/netbsd/
+#: (content/relay/setup/bridge/netbsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/debian-ubuntu/
+#: (content/relay/setup/bridge/debian-ubuntu/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/windows/
+#: (content/relay/setup/bridge/windows/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/dragonflybsd/
+#: (content/relay/setup/bridge/dragonflybsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/docker/
+#: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
+#: (content/relay/setup/bridge/centos-rhel-opensuse/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/fedora/
+#: (content/relay/setup/bridge/fedora/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/freebsd/
+#: (content/relay/setup/bridge/freebsd/contents+en.lr:page.body)
+#: https://community.torproject.org/relay/setup/bridge/openbsd/
+#: (content/relay/setup/bridge/openbsd/contents+en.lr:page.body)
+msgid ""
+"If you are having trouble setting up your bridge, have a look at [our help "
+"section](../../../getting-help/)."
+msgstr ""
+
 #: https://community.torproject.org/relay/setup/bridge/netbsd/
 #: (content/relay/setup/bridge/netbsd/contents+en.lr:page.body)
 #: https://community.torproject.org/relay/setup/bridge/windows/
 #: (content/relay/setup/bridge/windows/contents+en.lr:page.body)
 msgid ""
-"If you are having troubles setting up your bridge, have a look at [our help "
-"section](https://community.torproject.org/relay/getting-help/). If your "
-"bridge is now running, check out the [post-install notes](../post-install/)."
+"If your bridge is now running, check out the [post-install notes](../../post-"
+"install/)."
 msgstr ""
 
 #: https://community.torproject.org/relay/setup/bridge/post-install/
@@ -15684,23 +15704,6 @@ msgstr ""
 msgid "### 6. Final notes"
 msgstr ""
 
-#: https://community.torproject.org/relay/setup/bridge/debian-ubuntu/
-#: (content/relay/setup/bridge/debian-ubuntu/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/bridge/docker/
-#: (content/relay/setup/bridge/docker/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/bridge/centos-rhel-opensuse/
-#: (content/relay/setup/bridge/centos-rhel-opensuse/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/bridge/fedora/
-#: (content/relay/setup/bridge/fedora/contents+en.lr:page.body)
-#: https://community.torproject.org/relay/setup/bridge/freebsd/
-#: 

[tor-commits] [community/translations] content updates

[emmapeel]

commit 7c344b869dff885fbaa0fa71366a48b0a006ee49
Author: emma peel 
Date:   Sat Oct 9 20:21:28 2021 +0200

content updates
---
 content/onion-services/talk/contents.lr | 2 +-
 content/relay/setup/bridge/dragonflybsd/contents.lr | 2 +-
 content/relay/setup/bridge/netbsd/contents.lr   | 3 ++-
 content/relay/setup/bridge/windows/contents.lr  | 3 ++-
 content/training/best-practices/contents.lr | 4 ++--
 5 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/content/onion-services/talk/contents.lr 
b/content/onion-services/talk/contents.lr
index 07be9be..2105b36 100644
--- a/content/onion-services/talk/contents.lr
+++ b/content/onion-services/talk/contents.lr
@@ -116,7 +116,7 @@ OnionShare was developed after a human rights violation 
during the Snowden revel
 
 ### Decentralization
 
-As explained in 
[Overview](https://community.torproject.org/onion-services/overview/), there's 
no central authority that approves or rejects onion services.
+As explained in [Overview](../overview/), there's no central authority that 
approves or rejects onion services.
 The address of an onion service is automatically generated.
 Operators don't use the regular DNS infrastructure and do not need to purchase 
or register a domain name.
 
diff --git a/content/relay/setup/bridge/dragonflybsd/contents.lr 
b/content/relay/setup/bridge/dragonflybsd/contents.lr
index a30f67f..64cf3a3 100644
--- a/content/relay/setup/bridge/dragonflybsd/contents.lr
+++ b/content/relay/setup/bridge/dragonflybsd/contents.lr
@@ -128,7 +128,7 @@ To confirm your bridge is running with no issues, you 
should see something like
 
 ### 6. Final Notes
 
-If you are having troubles setting up your bridge, have a look at [our help 
section](../../../getting-help/).
+If you are having trouble setting up your bridge, have a look at [our help 
section](../../../getting-help/).
 If your bridge is now running, check out the [post-install 
notes](../post-install/).
 
 ---
diff --git a/content/relay/setup/bridge/netbsd/contents.lr 
b/content/relay/setup/bridge/netbsd/contents.lr
index 37af844..7fab67b 100644
--- a/content/relay/setup/bridge/netbsd/contents.lr
+++ b/content/relay/setup/bridge/netbsd/contents.lr
@@ -84,7 +84,8 @@ To confirm your bridge is running with no issues, you should 
see something like
 
 ### 5. Final Notes
 
-If you are having troubles setting up your bridge, have a look at [our help 
section](https://community.torproject.org/relay/getting-help/). If your bridge 
is now running, check out the [post-install notes](../post-install/).
+If you are having trouble setting up your bridge, have a look at [our help 
section](../../../getting-help/).
+If your bridge is now running, check out the [post-install 
notes](../../post-install/).
 
 ---
 subtitle: How to deploy an obfs4 bridge on NetBSD
diff --git a/content/relay/setup/bridge/windows/contents.lr 
b/content/relay/setup/bridge/windows/contents.lr
index 9b6a011..2d3260f 100644
--- a/content/relay/setup/bridge/windows/contents.lr
+++ b/content/relay/setup/bridge/windows/contents.lr
@@ -95,7 +95,8 @@ To confirm your bridge is running with no issues, you should 
see something like
 
 ### 6. Final notes
 
-If you are having troubles setting up your bridge, have a look at [our help 
section](https://community.torproject.org/relay/getting-help/). If your bridge 
is now running, check out the [post-install notes](../post-install/).
+If you are having trouble setting up your bridge, have a look at [our help 
section](../../../getting-help/).
+If your bridge is now running, check out the [post-install 
notes](../../post-install/).
 
 ---
 subtitle: How to deploy an obfs4 bridge on Windows
diff --git a/content/training/best-practices/contents.lr 
b/content/training/best-practices/contents.lr
index 91bb2dd..c3c87a8 100644
--- a/content/training/best-practices/contents.lr
+++ b/content/training/best-practices/contents.lr
@@ -51,7 +51,7 @@ Once you've answered those questions, you're ready to plan 
your training!
Will you be able to handle this alone? Or will you require partners?
If you need more help, make sure the partners you're bringing in are aware 
of the safety needs of the community, and communicate with your contacts in the 
community to make sure they're okay with you bringing in additional trainers.
 7. Make sure your presentation is up-to-date (both information and 
screenshots) and save your presentation in two file formats -- for example, odp 
and pdf -- and on at least one additional device -- for example, on your 
computer and on a USB stick.
-8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](/training/code-of-conduct/).
+8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](../training/code-of-conduct/).
 
 You can also start the training by asking participants to come up with their 
own community agreements for the space.
 
@@ -62,7 +62,7 @@ You can also start 

[tor-commits] [community/translations] typo

[emmapeel]

commit 471cbd18b1ca9de402d4bddae60af054fa5e3550
Author: emma peel 
Date:   Sat Oct 9 20:54:49 2021 +0200

typo
---
 content/training/best-practices/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/training/best-practices/contents.lr 
b/content/training/best-practices/contents.lr
index c3c87a8..43b83b5 100644
--- a/content/training/best-practices/contents.lr
+++ b/content/training/best-practices/contents.lr
@@ -62,7 +62,7 @@ You can also start the training by asking participants to 
come up with their own
 3. Communicate about when you'll take questions, either during the training, 
at the end, or both.
 4. Communicate about how you'll offer hands-on help (if at all).
 5. Communicate about how participants can contact you securely after the 
training.
-6. Show the participants the retources at [community.torproject.org](/) and 
[support.torproject.org](https://support.torproject.org).
+6. Show the participants the resources at [community.torproject.org](/) and 
[support.torproject.org](https://support.torproject.org).
 7. Show the participants other resources like 
[sec.eff.org](https://sec.eff.org).
 
 ## After the training



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

[tor-commits] [community/master] more corrections for https://gitlab.torproject.org/tpo/web/community/-/issues/206

[emmapeel]

commit 5eaa7d0580dbdeb99f21f146afb0983a396b4755
Author: emma peel 
Date:   Sat Oct 9 20:20:28 2021 +0200

more corrections for 
https://gitlab.torproject.org/tpo/web/community/-/issues/206
---
 content/onion-services/talk/contents.lr| 2 +-
 content/relay/setup/bridge/netbsd/contents.lr  | 3 ++-
 content/relay/setup/bridge/windows/contents.lr | 3 ++-
 content/training/best-practices/contents.lr| 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/content/onion-services/talk/contents.lr 
b/content/onion-services/talk/contents.lr
index 07be9be..2105b36 100644
--- a/content/onion-services/talk/contents.lr
+++ b/content/onion-services/talk/contents.lr
@@ -116,7 +116,7 @@ OnionShare was developed after a human rights violation 
during the Snowden revel
 
 ### Decentralization
 
-As explained in 
[Overview](https://community.torproject.org/onion-services/overview/), there's 
no central authority that approves or rejects onion services.
+As explained in [Overview](../overview/), there's no central authority that 
approves or rejects onion services.
 The address of an onion service is automatically generated.
 Operators don't use the regular DNS infrastructure and do not need to purchase 
or register a domain name.
 
diff --git a/content/relay/setup/bridge/netbsd/contents.lr 
b/content/relay/setup/bridge/netbsd/contents.lr
index 37af844..7fab67b 100644
--- a/content/relay/setup/bridge/netbsd/contents.lr
+++ b/content/relay/setup/bridge/netbsd/contents.lr
@@ -84,7 +84,8 @@ To confirm your bridge is running with no issues, you should 
see something like
 
 ### 5. Final Notes
 
-If you are having troubles setting up your bridge, have a look at [our help 
section](https://community.torproject.org/relay/getting-help/). If your bridge 
is now running, check out the [post-install notes](../post-install/).
+If you are having trouble setting up your bridge, have a look at [our help 
section](../../../getting-help/).
+If your bridge is now running, check out the [post-install 
notes](../../post-install/).
 
 ---
 subtitle: How to deploy an obfs4 bridge on NetBSD
diff --git a/content/relay/setup/bridge/windows/contents.lr 
b/content/relay/setup/bridge/windows/contents.lr
index 9b6a011..2d3260f 100644
--- a/content/relay/setup/bridge/windows/contents.lr
+++ b/content/relay/setup/bridge/windows/contents.lr
@@ -95,7 +95,8 @@ To confirm your bridge is running with no issues, you should 
see something like
 
 ### 6. Final notes
 
-If you are having troubles setting up your bridge, have a look at [our help 
section](https://community.torproject.org/relay/getting-help/). If your bridge 
is now running, check out the [post-install notes](../post-install/).
+If you are having trouble setting up your bridge, have a look at [our help 
section](../../../getting-help/).
+If your bridge is now running, check out the [post-install 
notes](../../post-install/).
 
 ---
 subtitle: How to deploy an obfs4 bridge on Windows
diff --git a/content/training/best-practices/contents.lr 
b/content/training/best-practices/contents.lr
index 91bb2dd..c3c87a8 100644
--- a/content/training/best-practices/contents.lr
+++ b/content/training/best-practices/contents.lr
@@ -51,7 +51,7 @@ Once you've answered those questions, you're ready to plan 
your training!
Will you be able to handle this alone? Or will you require partners?
If you need more help, make sure the partners you're bringing in are aware 
of the safety needs of the community, and communicate with your contacts in the 
community to make sure they're okay with you bringing in additional trainers.
 7. Make sure your presentation is up-to-date (both information and 
screenshots) and save your presentation in two file formats -- for example, odp 
and pdf -- and on at least one additional device -- for example, on your 
computer and on a USB stick.
-8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](/training/code-of-conduct/).
+8. Decide how you will facilitate a safer space. We recommend using the [Tor 
Code of Conduct](../training/code-of-conduct/).
 
 You can also start the training by asking participants to come up with their 
own community agreements for the space.
 
@@ -62,7 +62,7 @@ You can also start the training by asking participants to 
come up with their own
 3. Communicate about when you'll take questions, either during the training, 
at the end, or both.
 4. Communicate about how you'll offer hands-on help (if at all).
 5. Communicate about how participants can contact you securely after the 
training.
-6. Show the participants the resources at 
[community.torproject.org](https://community.torproject.org) and 
[support.torproject.org](https://support.torproject.org).
+6. Show the participants the retources at [community.torproject.org](/) and 
[support.torproject.org](https://support.torproject.org).
 7. Show the participants other resources like 
[sec.eff.org](https://sec.eff.org).
 
 ## After the 

[tor-commits] [community/master] normalize common phrase

[emmapeel]

commit 2008f75684486c221b270ca0f257c69b935c2eca
Author: emma peel 
Date:   Sat Oct 9 20:11:12 2021 +0200

normalize common phrase
---
 content/relay/setup/bridge/dragonflybsd/contents.lr | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/relay/setup/bridge/dragonflybsd/contents.lr 
b/content/relay/setup/bridge/dragonflybsd/contents.lr
index a30f67f..64cf3a3 100644
--- a/content/relay/setup/bridge/dragonflybsd/contents.lr
+++ b/content/relay/setup/bridge/dragonflybsd/contents.lr
@@ -128,7 +128,7 @@ To confirm your bridge is running with no issues, you 
should see something like
 
 ### 6. Final Notes
 
-If you are having troubles setting up your bridge, have a look at [our help 
section](../../../getting-help/).
+If you are having trouble setting up your bridge, have a look at [our help 
section](../../../getting-help/).
 If your bridge is now running, check out the [post-install 
notes](../post-install/).
 
 ---

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

[tor-commits] [community/translations] update translation file

[emmapeel]

commit 1190bd350ffc4006d15ae8b5ea18964721a9b3b3
Author: emma peel 
Date:   Sat Oct 9 18:53:41 2021 +0200

update translation file
---
 i18n/contents.pot | 162 +++---
 1 file changed, 69 insertions(+), 93 deletions(-)

diff --git a/i18n/contents.pot b/i18n/contents.pot
index 8a9430f..d26ddec 100644
--- a/i18n/contents.pot
+++ b/i18n/contents.pot
@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2021-10-09 13:08+CET\n"
+"POT-Creation-Date: 2021-10-09 18:52+CET\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME \n"
 "Language-Team: en \n"
@@ -398,8 +398,7 @@ msgstr ""
 #: (content/user-research/open/contents+en.lr:page.body)
 msgid ""
 "Before running Tor user research, be sure you read our [Guidelines to "
-"becoming a user researcher with Tor](https://community.torproject.org/user-;
-"research/guidelines)."
+"becoming a user researcher with Tor](../guidelines/)."
 msgstr ""
 
 #: https://community.torproject.org/user-research/open/
@@ -891,8 +890,8 @@ msgstr ""
 #: (content/user-research/how-to-volunteer/contents+en.lr:page.body)
 msgid ""
 "If you're already familiar with the Tor Project and user testing, have a "
-"look at our [current needs for user research](https://community.torproject.;
-"org/user-research/open/) and see which study better suits you."
+"look at our [current needs for user research](../open/) and see which study "
+"better suits you."
 msgstr ""
 
 #: https://community.torproject.org/user-research/how-to-volunteer/
@@ -907,13 +906,12 @@ msgstr ""
 msgid ""
 "As a volunteer we also ask that you read and follow our [Code of Conduct]"
 "(https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.;
-"txt), as well our [Guidelines for Research](https://community.torproject.org/;
-"user-research/guidelines/)."
+"txt), as well our [Guidelines for Research](../guidelines/)."
 msgstr ""
 
 #: https://community.torproject.org/user-research/how-to-volunteer/
 #: (content/user-research/how-to-volunteer/contents+en.lr:page.body)
-msgid "**Why do we run Demographics?**"
+msgid "### Why do we run Demographics?"
 msgstr ""
 
 #: https://community.torproject.org/user-research/how-to-volunteer/
@@ -1029,8 +1027,8 @@ msgstr ""
 #: https://community.torproject.org/user-research/how-to-volunteer/
 #: (content/user-research/how-to-volunteer/contents+en.lr:page.body)
 msgid ""
-"Please read our [Guidelines](https://community.torproject.org/user-research/;
-"guidelines/) to get to know this process more."
+"Please read our [Guidelines](../guidelines/) to get to know this process "
+"more."
 msgstr ""
 
 #: https://community.torproject.org/user-research/how-to-volunteer/
@@ -1076,8 +1074,7 @@ msgstr ""
 #: https://community.torproject.org/user-research/how-to-volunteer/
 #: (content/user-research/how-to-volunteer/contents+en.lr:page.body)
 msgid ""
-"- Learn more about our users by reading [Tor's user personas](https://;
-"community.torproject.org/user-research/persona)."
+"- Learn more about our users by reading [Tor's user personas](../persona/)."
 msgstr ""
 
 #: https://community.torproject.org/user-research/reports/
@@ -1522,8 +1519,7 @@ msgstr ""
 #: https://community.torproject.org/training/risks/
 #: (content/training/risks/contents+en.lr:page.body)
 msgid ""
-"* [EFF Tor legal FAQ](https://community.torproject.org/relay/community-;
-"resources/eff-tor-legal-faq/)"
+"* [EFF Tor legal FAQ](../../relay/community-resources/eff-tor-legal-faq/)"
 msgstr ""
 
 #: https://community.torproject.org/training/risks/
@@ -1584,15 +1580,12 @@ msgstr ""
 #: https://community.torproject.org/training/checklist/
 #: (content/training/checklist/contents+en.lr:page.body)
 msgid ""
-"* I read and agree with the Tor Project [Code of Coduct](https://community.;
-"torproject.org/training/code-of-conduct/)"
+"* I read and agree with the Tor Project [Code of Coduct](../code-of-conduct/)"
 msgstr ""
 
 #: https://community.torproject.org/training/checklist/
 #: (content/training/checklist/contents+en.lr:page.body)
-msgid ""
-"* I read the Training [Best Practices](https://community.torproject.org/;
-"training/best-practices/)"
+msgid "* I read the Training [Best Practices](../best-practices/)"
 msgstr ""
 
 #: https://community.torproject.org/training/checklist/
@@ -1602,9 +1595,7 @@ msgstr ""
 
 #: https://community.torproject.org/training/checklist/
 #: (content/training/checklist/contents+en.lr:page.body)
-msgid ""
-"* I reviewed my [training slides](https://community.torproject.org/training/;
-"resources/)"
+msgid "* I reviewed my [training slides](../resources/)"
 msgstr ""
 
 #: https://community.torproject.org/training/checklist/
@@ -2803,10 +2794,9 @@ msgstr ""
 #: https://community.torproject.org/onion-services/talk/
 #: (content/onion-services/talk/contents+en.lr:page.body)
 msgid ""
-"[Tor 

[tor-commits] [community/translations] unify sentence in one line to get one l10n string

[emmapeel]

commit d994008118551779173ea054e84e799d15f43977
Author: emma peel 
Date:   Sat Oct 9 14:10:39 2021 +0200

unify sentence in one line to get one l10n string
---
 content/relay/community-resources/tor-abuse-templates/contents.lr | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/content/relay/community-resources/tor-abuse-templates/contents.lr 
b/content/relay/community-resources/tor-abuse-templates/contents.lr
index 3d2f00c..89a96f3 100644
--- a/content/relay/community-resources/tor-abuse-templates/contents.lr
+++ b/content/relay/community-resources/tor-abuse-templates/contents.lr
@@ -148,8 +148,7 @@ With respect to your account, given that the attacker used 
Tor and not a large b
 Our recommendation is to treat this event as though there was a login from an 
open wireless access point in your city. Reset your password, and if you don't 
have antivirus already, download the free AVG: 
http://free.avg.com/us-en/download, Spybot SD: 
http://www.safer-networking.org/nl/home/index.html, and/or AdAware: 
http://www.lavasoft.com/?domain=lavasoftusa.com.
 Use these to scan to check for keyloggers or spyware that someone with access 
to your computer may have installed.
 
-To help protect yourself while using open wireless, consider using this 
Firefox plugin: https://www.eff.org/https-everywhere/ and encourage the
-site maintainer to support HTTPS logins.
+To help protect yourself while using open wireless, consider using this 
Firefox plugin:  and encourage the site 
maintainer to support HTTPS logins.
 ```
 
 ## Hacking (PHP Webshells, XSS, SQL Injection)



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

[tor-commits] [community/translations] better internal links

[emmapeel]

commit d2395c15bced91ecea0bd64875273f2ed9248bd9
Author: emma peel 
Date:   Sat Oct 9 18:38:40 2021 +0200

better internal links
---
 content/onion-services/advanced/client-auth/contents.lr  |  2 +-
 content/onion-services/advanced/dos/contents.lr  |  2 +-
 content/onion-services/advanced/https/contents.lr|  2 +-
 content/onion-services/advanced/opsec/contents.lr|  2 +-
 content/onion-services/setup/contents.lr |  8 
 content/onion-services/talk/contents.lr  | 10 +-
 content/outreach/meetup/contents.lr  | 10 +-
 .../community-resources/tor-exit-guidelines/contents.lr  |  2 +-
 .../community-resources/tor-relay-universities/contents.lr   |  4 +++-
 content/relay/setup/bridge/centos-rhel-opensuse/contents.lr  |  4 ++--
 content/relay/setup/bridge/debian-ubuntu/contents.lr |  4 ++--
 content/relay/setup/bridge/docker/contents.lr|  4 ++--
 content/relay/setup/bridge/dragonflybsd/contents.lr  |  4 ++--
 content/relay/setup/bridge/fedora/contents.lr|  4 ++--
 content/relay/setup/bridge/freebsd/contents.lr   |  4 ++--
 content/relay/setup/bridge/netbsd/contents.lr|  2 +-
 content/relay/setup/bridge/openbsd/contents.lr   |  4 ++--
 content/relay/setup/bridge/windows/contents.lr   |  2 +-
 content/training/checklist/contents.lr   |  6 +++---
 content/training/risks/contents.lr   |  2 +-
 content/user-research/how-to-volunteer/contents.lr   | 12 ++--
 content/user-research/open/contents.lr   |  2 +-
 22 files changed, 49 insertions(+), 47 deletions(-)

diff --git a/content/onion-services/advanced/client-auth/contents.lr 
b/content/onion-services/advanced/client-auth/contents.lr
index 24cb573..14f80c9 100644
--- a/content/onion-services/advanced/client-auth/contents.lr
+++ b/content/onion-services/advanced/client-auth/contents.lr
@@ -28,7 +28,7 @@ If no authorization is configured, the service will be 
accessible to anyone with
 
 ### Service side
 
-To configure client authorization on the service side, the 
`/authorized_clients/` directory needs to exist. Following 
the instructions described in the section 
[Setup](https://community.torproject.org/onion-services/setup/) will 
automatically create this directory.
+To configure client authorization on the service side, the 
`/authorized_clients/` directory needs to exist. Following 
the instructions described in the section [Setup](../../setup/) will 
automatically create this directory.
 Client authorization will only be enabled for the service if tor successfully 
loads at least one authorization file.
 
 For now, you need to create the keys yourself with a script (like these 
written in 
[Bash](https://gist.github.com/mtigas/9c2386adf65345be34045dace134140b), 
[Rust](https://github.com/haxxpop/torkeygen) or 
[Python](https://github.com/pastly/python-snippits/blob/master/src/tor/x25519-gen.py))
 or manually.
diff --git a/content/onion-services/advanced/dos/contents.lr 
b/content/onion-services/advanced/dos/contents.lr
index 297e88b..80b6ecb 100644
--- a/content/onion-services/advanced/dos/contents.lr
+++ b/content/onion-services/advanced/dos/contents.lr
@@ -32,7 +32,7 @@ Onionbalance is available for [v3 onion 
services](https://blog.torproject.org/co
 
 If you have users you trust, give them dedicated onion service and client 
authorization credentials so that it can always be available.
 For users you don't trust, split them into multiple addresses.
-That said, having too many onion addresses is actually bad for your security 
(because of the use of many guard nodes), so try to use [client 
authorization](https://community.torproject.org/onion-services/advanced/client-auth)
 when possible.
+That said, having too many onion addresses is actually bad for your security 
(because of the use of many guard nodes), so try to use [client 
authorization](../client-auth/) when possible.
 
 ### Captchas and cookies
 
diff --git a/content/onion-services/advanced/https/contents.lr 
b/content/onion-services/advanced/https/contents.lr
index 9122a0e..dda57df 100644
--- a/content/onion-services/advanced/https/contents.lr
+++ b/content/onion-services/advanced/https/contents.lr
@@ -34,7 +34,7 @@ We compiled some topics and arguments, so you can analyze 
what's the best for yo
 
 1. As anyone can generate an onion address and its 56 random alphanumeric 
characters, some enterprise onions believe that associating their onion site to 
an HTTPS certificate might be a solution to announce their service to users.
 Users would need to click and do a manual verification, and that would show 
that they're visiting the onion site that they're expecting.
-Alternatively, websites can provide other ways to verify their onion address 
using HTTPS, for example, linking their onion site 

[tor-commits] [community/master] better layout, trailing spaces

[emmapeel]

commit 2b60c3b56a57c0563ec4213df3d767b3ed9f2d50
Author: emma peel 
Date:   Sat Oct 9 18:34:48 2021 +0200

better layout, trailing spaces
---
 content/user-research/how-to-volunteer/contents.lr | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/content/user-research/how-to-volunteer/contents.lr 
b/content/user-research/how-to-volunteer/contents.lr
index 36b95a6..b6da55b 100644
--- a/content/user-research/how-to-volunteer/contents.lr
+++ b/content/user-research/how-to-volunteer/contents.lr
@@ -23,7 +23,7 @@ Remember to drop us an email telling us about your plans so 
we can follow and su
 
 As a volunteer we also ask that you read and follow our [Code of 
Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt),
 as well our [Guidelines for Research](../guidelines/).
 
-**Why do we run Demographics?** 
+### Why do we run Demographics?
 We don't collect personal data in our 
[Demographics](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/scripts%20and%20activities/2020/user_demographics-en.md),
 and all questions are optional.
 We believe it's important to collect basic demographics to help us understand 
if we are meeting our mission regarding diversity and inclusion.
 In addition, collecting these demographics is required for specific studies to 
support human rights.
@@ -51,7 +51,7 @@ Please read our [Guidelines](../guidelines/) to get to know 
this process more.
 - Read the guidelines on [how to do user research with 
Tor](https://gitlab.torproject.org/tpo/ux/research/-/blob/master/README.md).
 - Read and follow our [Code of 
Conduct](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt).
 - If you don't have one yet, [request a Gitlab 
account](https://support.torproject.org/misc/bug-or-feedback/).
-- Open an issue in the [UX Research 
Repository](https://gitlab.torproject.org/tpo/ux/research/-/issues). 
+- Open an issue in the [UX Research 
Repository](https://gitlab.torproject.org/tpo/ux/research/-/issues).
 - Subscribe to the [UX mailing 
list](https://lists.torproject.org/cgi-bin/mailman/listinfo).
 - Learn more about our users by reading [Tor's user personas](../persona/).
 ---

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