[tor-commits] [stem/master] Travis: Remove obsolete tor 0.3.4 and experimental-0.4.0 jobs

[atagar]

commit 5a62f7684d900f398e541bd1c0ea0e2e00a9f7fc
Author: teor 
Date:   Thu Jun 13 17:59:56 2019 +1000

Travis: Remove obsolete tor 0.3.4 and experimental-0.4.0 jobs

Part of 30877.
---
 .travis.yml | 17 -
 1 file changed, 17 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 91029687..c7882b01 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,14 +41,6 @@ matrix:
   packages:
 - tor
   env: TOR="0.2.9-nightly" TARGET=""
-- addons:
-apt:
-  sources:
-- sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-nightly-0.3.4.x-xenial main'
-  key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
-  packages:
-- tor
-  env: TOR="0.3.4-nightly" TARGET=""
 ## The current stable release is 0.3.5, so we don't have a separate
 ## 0.3.5-stable job
 - addons:
@@ -67,15 +59,6 @@ matrix:
   packages:
 - tor
   env: TOR="0.3.5-nightly" TARGET=""
-## The experimental deb line needs to be updated when 0.4.0 becomes stable
-- addons:
-apt:
-  sources:
-- sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-experimental-0.4.0.x-xenial main'
-  key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
-  packages:
-- tor
-  env: TOR="0.4.0-nightly" TARGET=""
 
 ## Test all supported python releases
 ## Pre-installed in Travis xenial:



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

[tor-commits] [stem/master] Travis: stable is now 0.4.0

[atagar]

commit d5f8aa10ddaaffbe4c51fbe3ae6fc4fbd9b5c8e0
Author: teor 
Date:   Thu Jun 13 18:01:32 2019 +1000

Travis: stable is now 0.4.0

Move stable job and update comments.

Add a TODO for 0.4.0 and 0.4.1 nightlies

Closes 30877.
---
 .travis.yml | 13 +++--
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c7882b01..a7d72821 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -41,24 +41,25 @@ matrix:
   packages:
 - tor
   env: TOR="0.2.9-nightly" TARGET=""
-## The current stable release is 0.3.5, so we don't have a separate
-## 0.3.5-stable job
 - addons:
 apt:
   sources:
-- sourceline: 'deb https://deb.torproject.org/torproject.org 
xenial main'
+- sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-nightly-0.3.5.x-xenial main'
   key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
   packages:
 - tor
-  env: TOR="stable-release" TARGET=""
+  env: TOR="0.3.5-nightly" TARGET=""
+## The current stable release is 0.4.0
 - addons:
 apt:
   sources:
-- sourceline: 'deb https://deb.torproject.org/torproject.org 
tor-nightly-0.3.5.x-xenial main'
+- sourceline: 'deb https://deb.torproject.org/torproject.org 
xenial main'
   key_url: 
'https://deb.torproject.org/torproject.org/A3C4F0F979CAA22CDBA8F512EE8CBC9E886DDD89.asc'
   packages:
 - tor
-  env: TOR="0.3.5-nightly" TARGET=""
+  env: TOR="stable-release" TARGET=""
+## TODO: add 0.4.0-nightly and experimental-0.4.1 when available
+## See #30827.
 
 ## Test all supported python releases
 ## Pre-installed in Travis xenial:

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

[tor-commits] [community/master] Add Call to Action for Relay Operators Community

[pili]

commit 50a39c1075be9b98be9d3bb66bb9e317ca703830
Author: Pili Guerra 
Date:   Thu Jun 13 19:53:25 2019 +0200

Add Call to Action for Relay Operators Community
---
 templates/relay-operations.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/relay-operations.html b/templates/relay-operations.html
index f53046a..5be1d16 100644
--- a/templates/relay-operations.html
+++ b/templates/relay-operations.html
@@ -21,7 +21,7 @@
   
   
 {{ _('Connect 
with other Relay Operators') }}
-{{ _('Lorem ipsum dolor sit amet, consectetur 
adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna 
aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi 
ut aliquip ex ea commodo consequat.') }}
+{{ _('Running a relay requires technical skill and 
commitment, which is why we\'ve created a wealth of resources to help our relay 
operators. The best resource of all is the active community of relay operators 
on tor-rel...@lists.torproject.org and on IRC in #tor-relays. ') }}
 https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays;>
   {{ _('Relay Operators 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] Match other sections' layout by adding call to action and link to relay operators mailing list

[pili]

commit 2b4284bced4a82279c3fcf5e7bb143db756253f0
Author: Pili Guerra 
Date:   Thu Jun 13 19:25:34 2019 +0200

Match other sections' layout by adding call to action and link to relay 
operators mailing list
---
 templates/relay-operations.html | 7 +++
 1 file changed, 7 insertions(+)

diff --git a/templates/relay-operations.html b/templates/relay-operations.html
index 5482017..f53046a 100644
--- a/templates/relay-operations.html
+++ b/templates/relay-operations.html
@@ -19,4 +19,11 @@
   
 {% endfor %}
   
+  
+{{ _('Connect 
with other Relay Operators') }}
+{{ _('Lorem ipsum dolor sit amet, consectetur 
adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna 
aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi 
ut aliquip ex ea commodo consequat.') }}
+https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-relays;>
+  {{ _('Relay Operators 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] Update outreach section: remove tor speakers bureau card and move to call to action

[pili]

commit 29751b638defbc453357da12abcefb58d3898908
Author: Pili Guerra 
Date:   Thu Jun 13 19:01:12 2019 +0200

Update outreach section: remove tor speakers bureau card and move to call 
to action
---
 content/outreach/speakers/contents.lr | 20 
 templates/outreach.html   | 22 +-
 2 files changed, 17 insertions(+), 25 deletions(-)

diff --git a/content/outreach/speakers/contents.lr 
b/content/outreach/speakers/contents.lr
deleted file mode 100644
index 0092b41..000
--- a/content/outreach/speakers/contents.lr
+++ /dev/null
@@ -1,20 +0,0 @@
-section: outreach

-section_id: outreach

-color: primary

-_template: layout.html

-title: Tor Speakers Bureau

-subtitle: We have a dedicated group of Tor core contributors who are ready to 
speak at your next event. You can request a speaker by contacting 
speak...@torproject.org with your preferred topic, language requirement, date, 
and other details.

-key: 3

-html: two-columns-page.html

-body:
-
-## Tor Speakers Bureau
-We have a dedicated group of Tor core contributors who are ready to speak at 
your next event. You can request a speaker by contacting 
speak...@torproject.org with your preferred topic, language requirement, date, 
and other details.
\ No newline at end of file
diff --git a/templates/outreach.html b/templates/outreach.html
index eb45835..18c697a 100644
--- a/templates/outreach.html
+++ b/templates/outreach.html
@@ -9,18 +9,30 @@
   
   
 {% for child in this.children|sort(attribute='key') %}
-  
-
+  
+
   
-{{ child.title }}
-{{ child.subtitle }}
-{{ child.cta }} 
+
+  
+{{ _(child.title) 
}}
+  
+  {{ _(child.subtitle) }}
+
   
 
   
 {% endfor %}
   
   
+  {{ _('Tor 
Speakers Bureau') }}
+  
+  {{ _('We have a dedicated group of Tor core contributors who are ready 
to speak at your next event. You can request a speaker by contacting 
speak...@torproject.org with your preferred topic, language requirement, date, 
and other details.') }}
+  
+  mailto:speak...@torproject.org;>
+  {{ _('Request a Speaker') }}
+
+  
+  
 {{ _('Upcoming Tor 
Events') }}
   
 

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

[tor-commits] [community/master] Add code of conduct for trainers

[pili]

commit 37e40e0acbfefbbc351d0355dd32f4ca072dfdd6
Author: Pili Guerra 
Date:   Thu Jun 13 18:16:57 2019 +0200

Add code of conduct for trainers
---
 content/training/code-of-conduct/contents.lr | 25 +
 1 file changed, 25 insertions(+)

diff --git a/content/training/code-of-conduct/contents.lr 
b/content/training/code-of-conduct/contents.lr
new file mode 100644
index 000..0f3eab0
--- /dev/null
+++ b/content/training/code-of-conduct/contents.lr
@@ -0,0 +1,25 @@
+_model: page
+---
+section: training
+---
+section_id: training
+---
+color: primary
+---
+_template: layout.html
+---
+title: Code of Conduct for Trainers
+---
+subtitle: Don't be a jerk. Be awesome instead.
+---
+cta: Code of Conduct
+---
+key: 3
+---
+html: two-columns-page.html
+---
+body:
+
+##Code of Conduct for Trainers
+
+The Tor Project is committed to fostering an inclusive environment and 
community. Tor is a place where people should feel safe to engage, share their 
point of view, and participate. You can find our code of conduct 
[here](https://gitweb.torproject.org/community/policies.git/tree/code_of_conduct.txt)

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

[tor-commits] [community/master] Match other subsection layout

[pili]

commit bd4ff01386116a2de4db90c7bc5a9de4386b6f40
Author: Pili Guerra 
Date:   Thu Jun 13 18:16:33 2019 +0200

Match other subsection layout
---
 templates/training.html | 20 +++-
 1 file changed, 11 insertions(+), 9 deletions(-)

diff --git a/templates/training.html b/templates/training.html
index e843b1b..39d6df0 100644
--- a/templates/training.html
+++ b/templates/training.html
@@ -7,22 +7,24 @@
   
 
   
-  
-{% for child in this.children %}
-  
-
+  
+{% for child in this.children|sort(attribute='key') %}
+  
+
   
-
-{{ child.title }}
-{{ child.subtitle }}
-{{ child.cta }} 
+
+  
+{{ _(child.title) 
}}
+  
+  {{ _(child.subtitle) }}
+
   
 
   
 {% endfor %}
   
   
-{{ _('Join the 
Community') }}
+{{ _('Join the 
Community') }}
 
   {{ _('Are you interested in inviting someone from Tor to train your 
group? While we receive a high volume of training requests and may not be able 
to offer an in-person training, we may still be able to help. Contact the 
community team and let\'s talk.')}}
 



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

[tor-commits] [community/master] Minor wording fixes

[pili]

commit 879f22953047c48bc5c473ae0c4bcc78bd74cccf
Author: Pili Guerra 
Date:   Thu Jun 13 17:44:33 2019 +0200

Minor wording fixes
---
 content/localization/contents.lr   | 2 +-
 content/onion-services/contents.lr | 2 +-
 content/outreach/contents.lr   | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/content/localization/contents.lr b/content/localization/contents.lr
index 38a84d4..ccdc74d 100644
--- a/content/localization/contents.lr
+++ b/content/localization/contents.lr
@@ -10,7 +10,7 @@ title: Localization
 ---
 subtitle: We want Tor to work for everyone in the world, which means a lot of 
languages.
 ---
-cta: Will you help us to translate?
+cta: Help us to translate
 ---
 key: 2
 ---
diff --git a/content/onion-services/contents.lr 
b/content/onion-services/contents.lr
index 0077c71..9e51c1c 100644
--- a/content/onion-services/contents.lr
+++ b/content/onion-services/contents.lr
@@ -6,7 +6,7 @@ color: primary
 ---
 _template: layout.html
 ---
-title: .onion Services
+title: Onion Services
 ---
 subtitle: Onion services help you and your users defeat surveillance and 
censorship. Learn how you can deploy onion services.
 ---
diff --git a/content/outreach/contents.lr b/content/outreach/contents.lr
index f11f905..f18da38 100644
--- a/content/outreach/contents.lr
+++ b/content/outreach/contents.lr
@@ -8,9 +8,9 @@ _template: layout.html
 ---
 title: Outreach
 ---
-subtitle: Bring Tor swag to our next community event.
+subtitle: Bring Tor materials to your next community event.
 ---
-cta: Join the Tor community
+cta: Tell the world about Tor
 ---
 key: 3
 ---

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

[tor-commits] [community/master] hidding user research section

[pili]

commit fcb57635fafffdcf23d03a528d06e3aa8a6a12cc
Author: Antonela 
Date:   Thu Jun 13 10:27:24 2019 -0300

hidding user research section

we will release it after the dev meeting
---
 content/user-research/contents.lr | 4 +++-
 databags/pagenav+en.ini   | 4 
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/content/user-research/contents.lr 
b/content/user-research/contents.lr
index dfeb5e0..164efb8 100644
--- a/content/user-research/contents.lr
+++ b/content/user-research/contents.lr
@@ -4,13 +4,15 @@ section_id: user-research
 ---
 color: primary
 ---
+_hidden: yes
+---
 _template: layout.html
 ---
 title: User Research
 ---
 subtitle: We conduct user research while also respecting user privacy.
 ---
-cta: Learn how you can help
+cta: In progress
 ---
 key: 4
 ---
diff --git a/databags/pagenav+en.ini b/databags/pagenav+en.ini
index 2dd844a..cb5b415 100644
--- a/databags/pagenav+en.ini
+++ b/databags/pagenav+en.ini
@@ -10,10 +10,6 @@ label = Localization
 path = outreach
 label = Outreach
 
-[user-research]
-path = user-research
-label = User Research
-
 [relay-operations]
 path = relay-operations
 label = Relay Operations

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

[tor-commits] [community/master] Template fixes

[pili]

commit 4c928684805ff3e4a39aad0052cf13c938bc9017
Author: Pili Guerra 
Date:   Thu Jun 13 15:24:54 2019 +0200

Template fixes
---
 content/training/best-practices/contents.lr | 2 ++
 content/training/resources/contents.lr  | 2 ++
 templates/sidenav.html  | 2 +-
 templates/two-columns-page.html | 3 +--
 4 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/content/training/best-practices/contents.lr 
b/content/training/best-practices/contents.lr
index 741685b..09e08aa 100644
--- a/content/training/best-practices/contents.lr
+++ b/content/training/best-practices/contents.lr
@@ -1,3 +1,5 @@
+_model: page
+---
 section: training
 ---
 section_id: training
diff --git a/content/training/resources/contents.lr 
b/content/training/resources/contents.lr
index c453189..942724c 100644
--- a/content/training/resources/contents.lr
+++ b/content/training/resources/contents.lr
@@ -1,3 +1,5 @@
+_model: page
+---
 section: training
 ---
 section_id: training
diff --git a/templates/sidenav.html b/templates/sidenav.html
index 489faeb..3732254 100644
--- a/templates/sidenav.html
+++ b/templates/sidenav.html
@@ -27,7 +27,7 @@
   
  {{ _("Topics") }}
 
-   {% for child in this.parent.children %}
+  {% for child in this.parent.children|sort(attribute='key') %}
 
   {{ _(child.title) }}
diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index 51437e6..1823730 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -16,5 +16,4 @@
 
 Back to {{ this.parent.title }}
   
-
-
+
\ No newline at end of file

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

[tor-commits] [community/master] Update layout for inner pages

[pili]

commit ebdb465856ab1911e1006c054844a0f66e6e9bf8
Author: Pili Guerra 
Date:   Thu Jun 13 13:55:01 2019 +0200

Update layout for inner pages
---
 content/relay-operations/community-resources/contents.lr  | 2 +-
 content/relay-operations/relays-requirements/contents.lr  | 2 +-
 content/relay-operations/technical-setup/centosrhel/contents.lr   | 2 +-
 content/relay-operations/technical-setup/contents.lr  | 2 +-
 content/relay-operations/technical-setup/debianubuntu/contents.lr | 2 +-
 content/relay-operations/technical-setup/exit-relay/contents.lr   | 2 +-
 content/relay-operations/technical-setup/fedora/contents.lr   | 2 +-
 content/relay-operations/technical-setup/freebsd/contents.lr  | 2 +-
 content/relay-operations/types-of-relays/contents.lr  | 2 +-
 9 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/content/relay-operations/community-resources/contents.lr 
b/content/relay-operations/community-resources/contents.lr
index 7149b51..b725337 100644
--- a/content/relay-operations/community-resources/contents.lr
+++ b/content/relay-operations/community-resources/contents.lr
@@ -12,6 +12,6 @@ subtitle: How to get involved with the Tor relay operator 
community, advice on r
 ---
 key: 4
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 body:
diff --git a/content/relay-operations/relays-requirements/contents.lr 
b/content/relay-operations/relays-requirements/contents.lr
index d089c7e..1d85623 100644
--- a/content/relay-operations/relays-requirements/contents.lr
+++ b/content/relay-operations/relays-requirements/contents.lr
@@ -12,7 +12,7 @@ subtitle: Requirements for Tor relays depend on the type of 
relay and the bandwi
 ---
 key: 2
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 body:
 
diff --git a/content/relay-operations/technical-setup/centosrhel/contents.lr 
b/content/relay-operations/technical-setup/centosrhel/contents.lr
index 6bf5811..af9f706 100644
--- a/content/relay-operations/technical-setup/centosrhel/contents.lr
+++ b/content/relay-operations/technical-setup/centosrhel/contents.lr
@@ -2,7 +2,7 @@ _model: page
 ---
 title: CentOS/RHEL
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 section: relay operations
 ---
diff --git a/content/relay-operations/technical-setup/contents.lr 
b/content/relay-operations/technical-setup/contents.lr
index fc255aa..65d44fc 100644
--- a/content/relay-operations/technical-setup/contents.lr
+++ b/content/relay-operations/technical-setup/contents.lr
@@ -12,7 +12,7 @@ title: Technical setup
 ---
 subtitle: Installing and configuring your Tor relay.
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 body:
 
diff --git a/content/relay-operations/technical-setup/debianubuntu/contents.lr 
b/content/relay-operations/technical-setup/debianubuntu/contents.lr
index 30a4c6c..79c652e 100644
--- a/content/relay-operations/technical-setup/debianubuntu/contents.lr
+++ b/content/relay-operations/technical-setup/debianubuntu/contents.lr
@@ -2,7 +2,7 @@ _model: page
 ---
 title: Debian/Ubuntu
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 section: relay operations
 ---
diff --git a/content/relay-operations/technical-setup/exit-relay/contents.lr 
b/content/relay-operations/technical-setup/exit-relay/contents.lr
index f16c92f..708c12d 100644
--- a/content/relay-operations/technical-setup/exit-relay/contents.lr
+++ b/content/relay-operations/technical-setup/exit-relay/contents.lr
@@ -2,7 +2,7 @@ _model: page
 ---
 title: Exit Relay Configuration
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 section: relay operations
 ---
diff --git a/content/relay-operations/technical-setup/fedora/contents.lr 
b/content/relay-operations/technical-setup/fedora/contents.lr
index d8018a9..ba5cfdb 100644
--- a/content/relay-operations/technical-setup/fedora/contents.lr
+++ b/content/relay-operations/technical-setup/fedora/contents.lr
@@ -2,7 +2,7 @@ _model: page
 ---
 title: Fedora
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 key: 3
 ---
diff --git a/content/relay-operations/technical-setup/freebsd/contents.lr 
b/content/relay-operations/technical-setup/freebsd/contents.lr
index 9073d5d..d1afab0 100644
--- a/content/relay-operations/technical-setup/freebsd/contents.lr
+++ b/content/relay-operations/technical-setup/freebsd/contents.lr
@@ -2,7 +2,7 @@ _model: page
 ---
 title: FreeBSD
 ---
-html: relay-operations.html
+html: two-columns-page.html
 ---
 section: relay operations
 ---
diff --git a/content/relay-operations/types-of-relays/contents.lr 
b/content/relay-operations/types-of-relays/contents.lr
index f78a338..791427e 100644
--- a/content/relay-operations/types-of-relays/contents.lr
+++ b/content/relay-operations/types-of-relays/contents.lr
@@ -12,7 +12,7 @@ subtitle: Bridges, guards, middle relays, and exits all serve 
important function
 ---
 key: 1
 ---
-html: relay-operations.html
+html: 

[tor-commits] [community/master] Update two-columns-page to add a link back to the parent page

[pili]

commit cc5ad1135a818b6dbe88173f2e19ceab1b4ba207
Author: Pili Guerra 
Date:   Thu Jun 13 13:56:02 2019 +0200

Update two-columns-page to add a link back to the parent page
---
 templates/two-columns-page.html | 14 ++
 1 file changed, 14 insertions(+)

diff --git a/templates/two-columns-page.html b/templates/two-columns-page.html
index e1f1839..51437e6 100644
--- a/templates/two-columns-page.html
+++ b/templates/two-columns-page.html
@@ -2,5 +2,19 @@
   {% include 'sidenav.html' %}
   
 {{ this.body }}
+
+{% for child in this.children|sort(attribute='key') %}
+
+
+
+{{ child.title }}
+{{ child.subtitle }}
+
+
+
+{% endfor %}
+
+Back to {{ this.parent.title }}
   
 
+

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

[tor-commits] [tor-browser-spec/master] Add Torbutton integration proposal

[gk]

commit 8178391d15a2ad8a5e4bd24ed99c86011600dcbb
Author: Georg Koppen 
Date:   Thu Jun 13 09:47:44 2019 +

Add Torbutton integration proposal
---
 .../104-integrate-torbutton-into-tor-browser.txt   | 263 +
 1 file changed, 263 insertions(+)

diff --git a/proposals/104-integrate-torbutton-into-tor-browser.txt 
b/proposals/104-integrate-torbutton-into-tor-browser.txt
new file mode 100644
index 000..ab5d0d6
--- /dev/null
+++ b/proposals/104-integrate-torbutton-into-tor-browser.txt
@@ -0,0 +1,263 @@
+Filename: 104-integrate-torbutton-into-tor-browser.txt
+Title: Integration of Torbutton into Tor Browser Core
+Author: Alex Catarineu
+Created: 13-May-2019
+Status: Accepted
+Ticket: #10760
+Target: Tor Browser 9 (Firefox ESR 68)
+
+1. Overview
+
+This proposal describes how we will integrate Torbutton into the browser
+core code.
+
+2. Motivation
+
+We refer to Tor Browser proposal 102 [1] for motivation, since it is shared. 
This
+has been a task in backlog for a while and we intend to use the ESR68 release
+to finally integrate Torbutton code in the tor-browser repository.
+
+3. Design
+
+The design is similar to the one specified in proposal 102 for Tor
+Launcher. One notable difference is that we do not need to maintain the
+capability to package the Torbutton code as a XUL/XPCOM extension. Besides,
+we will not continue further development of Torbutton in a separate repository,
+but directly in the tor-browser one.
+
+3.1 Source Code Integration
+
+Torbutton code is already a git submodule inside tor-browser, and used in
+Android without being an extension. Its source code is currently placed
+in toolkit/torproject/torbutton. For the scope of this proposal, we will
+keep that location for the parts that do not require moving somewhere
+else in the tor-browser repository. This includes XPCOM components, files
+needed for the build (moz.build, jar.mn, chrome.manifest), localization,
+UI resources and other logic that is loaded in the main process 
(chrome/content,
+chrome/skin). Therefore, we leave big code refactorization efforts (e.g. of
+torbutton.js) as a next step, once code has been integrated.
+
+Note that this code location differs from browser/extensions where Tor Launcher
+will be placed according to proposal 102. This is because while Tor Launcher is
+not used in Android, Torbutton components are. Therefore, toolkit seems a
+more suitable choice than browser, since the latter is Desktop only, while the
+other is shared.
+
+For reviewing purposes, work needed for this proposal for the files in
+toolkit/torproject/torbutton will be done on the Torbutton repository. Once the
+changes are accepted, the code will be moved to toolkit/torproject/torbutton
+together with the rest of commits in tor-browser needed for the integration.
+From then on, Torbutton code maintenance will happen entirely on tor-browser
+repository. Ideally, we would like to find a way to do this while keeping
+change history and original committers, but we are not sure this is possible.
+
+Changes in tor-browser-build will also be required to remove Torbutton as
+a dependency.
+
+3.2 The Location of Torbutton Files In The Final Browser Package
+
+All of the Torbutton files will be packaged inside omni.ja in the final
+browser package. Within omni.ja, files will be at the following locations:
+
+  chrome/torbutton/defaults/preferences/preferences.js
+  chrome/torbutton/defaults/
+  chrome/torbutton/components/
+  chrome/torbutton/content/
+  chrome/torbutton/locale/
+  chrome/torbutton/modules/
+  chrome/torbutton/skin/
+
+3.3 Firefox Build System Integration
+
+We will use the work that was already done for this in #25013 as part of
+Torbutton integration for Android.
+
+We will modify toolkit/moz.build to not only use Torbutton code on Android but
+also on Desktop, and also browser/installer/package-manifest.in to include
+the needed files.
+
+3.4 Remove unnecessary files for build
+
+The folder structure of the Torbutton repository is currently:
+
+  makexpi.sh
+  moz.build
+  pkg
+  README
+  README.BUILD
+  README.RELEASE
+  src
+  trans_tools
+  update-unsigned.rdf
+  website
+
+We will remove everything that is not needed for building, with the exception
+of trans_tool/import-translations.sh, which will be moved one level up
+together with the contents of src.
+
+The final structure will be:
+
+  chrome
+  chrome.manifest
+  components
+  CREDITS
+  defaults
+  jar.mn
+  modules
+  moz.build
+  import-translations.sh
+
+3.5 Code Changes
+
+3.5.1 Components
+
+In order to minimize code changes for the integration, we will keep the
+components almost as they are now. One exception is aboutTor, which can be
+easily moved to AboutRedirector.cpp by simply adding the about:tor definition
+in the corresponding array. After this proposals work, we can revise whether
+we can eliminate code that is not needed anymore, perhaps together with
+refactorization work for chrome/content scripts.
+
+aboutTor:
+  

[tor-commits] [community/master] Outreach section

[pili]

commit ed7d51a1134495f9a30c559df15ba20573e82844
Author: Pili Guerra 
Date:   Thu Jun 13 11:30:40 2019 +0200

Outreach section
---
 content/outreach/kit/contents.lr  | 7 +--
 content/outreach/speakers/contents.lr | 5 -
 content/outreach/talk/contents.lr | 6 +-
 templates/outreach.html   | 9 +++--
 4 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/content/outreach/kit/contents.lr b/content/outreach/kit/contents.lr
index deb74b4..5ddec4c 100644
--- a/content/outreach/kit/contents.lr
+++ b/content/outreach/kit/contents.lr
@@ -6,12 +6,15 @@ color: primary
 ---
 _template: layout.html
 ---
-title: Stream team kit
+title: Street team kit
 ---
 subtitle: This kit includes printable flyers, stickers, and other materials to 
get people excited about using Tor.
 ---
 key: 1
 ---
-html: outreach.html
+html: resources.html
 ---
 body:
+
+## Street Team Kit
+This kit includes printable flyers, stickers, and other materials to get 
people excited about using Tor.
\ No newline at end of file
diff --git a/content/outreach/speakers/contents.lr 
b/content/outreach/speakers/contents.lr
index 111e26d..0092b41 100644
--- a/content/outreach/speakers/contents.lr
+++ b/content/outreach/speakers/contents.lr
@@ -12,6 +12,9 @@ subtitle: We have a dedicated group of Tor core contributors 
who are ready to sp
 ---
 key: 3
 ---
-html: outreach.html
+html: two-columns-page.html
 ---
 body:
+
+## Tor Speakers Bureau
+We have a dedicated group of Tor core contributors who are ready to speak at 
your next event. You can request a speaker by contacting 
speak...@torproject.org with your preferred topic, language requirement, date, 
and other details.
\ No newline at end of file
diff --git a/content/outreach/talk/contents.lr 
b/content/outreach/talk/contents.lr
index 6f84a6f..a79be5f 100644
--- a/content/outreach/talk/contents.lr
+++ b/content/outreach/talk/contents.lr
@@ -12,6 +12,10 @@ subtitle: Here you'll find materials on basic Tor explainers 
and concepts, ideas
 ---
 key: 2
 ---
-html: outreach.html
+html: resources.html
 ---
 body:
+
+## Talk about Tor
+
+Here you'll find materials on basic Tor explainers and concepts, ideas for 
preparing a Tor talk, suggested social media posts, and more. 
\ No newline at end of file
diff --git a/templates/outreach.html b/templates/outreach.html
index 4b7235b..eb45835 100644
--- a/templates/outreach.html
+++ b/templates/outreach.html
@@ -7,17 +7,14 @@
   
 
   
-  {{ _('Help us translate') }}
   
 {% for child in this.children|sort(attribute='key') %}
   
 
   
-
-
-  {{ child.title }}
-  {{ child.subtitle }}
-
+{{ child.title }}
+{{ child.subtitle }}
+{{ child.cta }} 
   
 
   

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit beb0c94fb654b320d600984c34f9e9bcedbbbe38
Author: Translation commit bot 
Date:   Thu Jun 13 09:15:40 2019 +

Update translations for donatepages-messagespot
---
 locale/pl/LC_MESSAGES/messages.po | 24 +++-
 1 file changed, 23 insertions(+), 1 deletion(-)

diff --git a/locale/pl/LC_MESSAGES/messages.po 
b/locale/pl/LC_MESSAGES/messages.po
index c398f1742..22abce7d1 100644
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/locale/pl/LC_MESSAGES/messages.po
@@ -1741,6 +1741,8 @@ msgid ""
 "organizations support the Tor network and may be able to offer you tax-"
 "deductibility for your donation."
 msgstr ""
+"Albo, jeśli jesteś w Niemczech, Francji lub Szwecji, \n"
+"https://www.torproject.org/docs/faq.html.en#RelayDonations\;>te 
organizacje te wspierają sieć Tor i mogą zaoferować możliwość 
odliczenia podatku od darowizn."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:437
 msgid ""
@@ -1756,6 +1758,9 @@ msgid ""
 "options.html.en\" class=\"hyperlinks links\" target=\"_blank\">other ways "
 "you can donate."
 msgstr ""
+"Tak! Oto lista https://www.torproject.org/donate/donate-;
+"options.html.en\" class=\"hyperlinks links\" target=\"_blank\">innych "
+"sposobów, w jaki możesz przekazać dotację."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:448
 msgid "What is your donor privacy policy?"
@@ -1766,6 +1771,8 @@ msgid ""
 "Here is the Tor Project donor privacy policy."
 msgstr ""
+"Oto polityka prywatności darczyńców Tor Project."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:458
 msgid "What is your refund policy?"
@@ -1776,6 +1783,9 @@ msgid ""
 "If you want your donation refunded, please tell us by emailing giving(at)torproject.org."
 msgstr ""
+"Jeśli chcesz, aby Twoja darowizna została zwrócona, poinformuj nas o tym "
+"wysyłając maila na adres giving(małpa)torproject.org."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:464
 msgid ""
@@ -1783,6 +1793,8 @@ msgid ""
 "amount you donated, your full name, the payment method you used and your "
 "country of origin."
 msgstr ""
+"Aby dokonać zwrotu, musimy znać datę darowizny, kwotę darowizny, imię i "
+"nazwisko, sposób płatności i kraj pochodzenia."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:466
 msgid "Please also tell us why you're asking for a refund."
@@ -1823,7 +1835,7 @@ msgstr "Tak"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:496
 msgid "Does Tor Project accept matching donations?"
-msgstr ""
+msgstr "Czy Tor Project akceptuje wyrównywanie dotacji?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:500
 msgid ""
@@ -1852,12 +1864,16 @@ msgid ""
 "If your company isn't currently set up to match donations to the Tor "
 "Project, we would be happy to help with the paperwork."
 msgstr ""
+"Jeśli Twoja firma nie jest obecnie ustawiona na dopasowanie darowizn do Tor "
+"Project, chętnie pomożemy w załatwieniu formalności."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:506
 msgid ""
 "If you want help figuring out the process, write us at giving(at)torproject.org."
 msgstr ""
+"Jeśli chcesz pomóc w ustaleniu procesu, napisz do nas na giving(małpa)torproject.org."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:512
 msgid "Can I become a Tor Project member?"
@@ -1868,6 +1884,8 @@ msgid ""
 "Right now, we don't have a membership program, but we may set one up in the "
 "future."
 msgstr ""
+"W tej chwili nie mamy programu członkowskiego, ale możemy go założyć w "
+"przyszłości."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:518
 msgid ""
@@ -1876,6 +1894,10 @@ msgid ""
 "href=\"https://www.torproject.org/getinvolved/volunteer.html.en\;>this is a "
 "good place to start."
 msgstr ""
+"Jeśli chcesz zaangażować się w Tor Project, https://www.torproject.org/getinvolved/volunteer.html.en\;>to jest "
+"dobre miejsce na start."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:524
 msgid "How can I get a Tor t-shirt or stickers?"

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

[tor-commits] [community/master] restore lektor file

[pili]

commit fb1bbf5820f4b6331ff4e386f9e61a6b6454f50b
Author: Pili Guerra 
Date:   Wed Jun 12 18:38:42 2019 +0200

restore lektor file
---
 packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 0 -> 15397 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc 
b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc
new file mode 100644
index 000..488bd31
Binary files /dev/null and 
b/packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc differ

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

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit f66b76e3f6a57453063d1332efc5e1740e06a6ff
Author: Translation commit bot 
Date:   Thu Jun 13 08:50:28 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-ca.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tor-outreach2019-2020-ca.md b/tor-outreach2019-2020-ca.md
index bb41c2584..1cc0f7a5d 100644
--- a/tor-outreach2019-2020-ca.md
+++ b/tor-outreach2019-2020-ca.md
@@ -125,11 +125,11 @@ El Bekele no sap que la petició del lloc web prové de 
l'Amal, llevat que ella
 
 People all over the world use Tor to protect their privacy and access the web 
freely.
 
-Tor helps protect journalists, human rights defenders, domestic violence 
victims, academic researchers, and anyone experiencing tracking, censorship, or 
surveillance. 
+Tor ajuda a protegir els periodistes, defensors dels drets humans, víctimes 
de violència domèstica, investigadors acadèmics i qualsevol persona que 
experimenti seguiment, censura i vigilància.
 
 ## 6. Per què confiar en Tor?
 
-Tor is designed for privacy. We don’t know who our users are, and we don't 
keep logs of user activity.
+Tor és dissenyat per la privadesa. No sabem qui són els nostres usuaris i no 
conservem registres de la seva activitat.
 
 Els operadors de repetidors Tor no poden revelar la identitat real dels 
usuaris Tor.
 

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

[tor-commits] [community/master] Fix issues with page key

[pili]

commit d71b693ac47658fcf74a67fa162eb4e5dad9a10a
Author: Pili Guerra 
Date:   Thu Jun 13 10:37:45 2019 +0200

Fix issues with page key
---
 content/training/resources/contents.lr | 3 +++
 templates/training.html| 4 +---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/content/training/resources/contents.lr 
b/content/training/resources/contents.lr
index 58a6907..c453189 100644
--- a/content/training/resources/contents.lr
+++ b/content/training/resources/contents.lr
@@ -10,10 +10,13 @@ title: Training Resources
 ---
 subtitle: Do you teach your community about using Tor? These resources are for 
you.
 ---
+cta: Check out our resources
+---
 key: 2
 ---
 html: resources.html
 ---
 body:
 
+##Resources
 Do you teach your community about using Tor? These training resources are for 
you.
\ No newline at end of file
diff --git a/templates/training.html b/templates/training.html
index 65c7187..e843b1b 100644
--- a/templates/training.html
+++ b/templates/training.html
@@ -8,8 +8,7 @@
 
   
   
-{% for child in this.children|sort(attribute='key') %}
-  {% if child.key != '0' %}
+{% for child in this.children %}
   
 
   
@@ -20,7 +19,6 @@
   
 
   
-  {% endif %}
 {% endfor %}
   
   



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

[tor-commits] [community/master] Merge branch 'master' of git-rw.torproject.org:project/web/community into HEAD

[pili]

commit 2fc599c6edeac0cbe0826da35216fe35aab5e01d
Merge: d71b693 72520ae
Author: Pili Guerra 
Date:   Thu Jun 13 10:38:40 2019 +0200

Merge branch 'master' of git-rw.torproject.org:project/web/community into 
HEAD

 packages/i18n/__pycache__/lektor_i18n.cpython-37.pyc | Bin 15379 -> 0 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit da14101702650cdce85d23879b2f0790ad411094
Author: Translation commit bot 
Date:   Thu Jun 13 08:45:39 2019 +

Update translations for donatepages-messagespot
---
 locale/pl/LC_MESSAGES/messages.po | 42 ++-
 1 file changed, 41 insertions(+), 1 deletion(-)

diff --git a/locale/pl/LC_MESSAGES/messages.po 
b/locale/pl/LC_MESSAGES/messages.po
index bdd09eb3e..c398f1742 100644
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/locale/pl/LC_MESSAGES/messages.po
@@ -901,7 +901,7 @@ msgstr "Zapisz się do naszego newslettera"
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:35
 msgid "Get monthly updates and opportunities from the Tor Project."
-msgstr ""
+msgstr "Uzyskaj comiesięczne aktualizacje i możliwości od Tor Project."
 
 #: 
tmp/cache_locale/50/50777d283fdd4725b4b51b066a1fa065079d875050e04874af7ad8d37f823d3f.php:39
 msgid "Sign Up"
@@ -1071,6 +1071,13 @@ msgid ""
 "Federal Foreign Office of Germany, the U.S. Naval Research Laboratory, "
 "Omidyar Network, SRI International, and Radio Free Asia."
 msgstr ""
+"Tysiące osób przekazało środki na wsparcie Tor Project, a my 
otrzymaliśmy "
+"również fundusze od wielu organizacji, w tym od Google, the Ford 
Foundation,"
+" the Knight Foundation, Reddit, the U.S. National Science Foundation, the "
+"Electronic Frontier Foundation, Human Rights Watch, the Swedish "
+"International Development Cooperation Agency, the Federal Foreign Office of "
+"Germany, the U.S. Naval Research Laboratory, Omidyar Network, SRI "
+"International, and Radio Free Asia."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:129
 msgid ""
@@ -1123,6 +1130,10 @@ msgid ""
 "target=\"_blank\" "
 "href=\"https://www.torproject.org/about/overview.html.en\;>overview page."
 msgstr ""
+"Więcej na temat działania Tor można przeczytać na naszej https://www.torproject.org/about/overview.html.en\;>stronie "
+"przeglądowej."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:154
 msgid ""
@@ -1138,6 +1149,9 @@ msgid ""
 "href=\"https://www.torproject.org/docs/faq.html.en\;>This Tor Project "
 "FAQ has answers to all those questions, and more."
 msgstr ""
+"https://www.torproject.org/docs/faq.html.en\;>Te FAQ Tor Project "
+"ma odpowiedzi na wszystkie te pytania i więcej."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:164
 msgid "Does the Tor software work?"
@@ -1242,6 +1256,9 @@ msgid ""
 "href=\"https://www.torproject.org/about/financials.html.en\;>financial "
 "statements, and its Form 990."
 msgstr ""
+"Oto https://www.torproject.org/about/financials.html.en\;>sprawozdanie "
+"finansowe Tor Project i jego Formularz 990."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:206
 msgid "Where does the Tor Project's money come from?"
@@ -1373,6 +1390,9 @@ msgid ""
 "Your donation probably isn't tax-deductible (unless you pay taxes on U.S. "
 "income) but we would very much appreciate your support."
 msgstr ""
+"Twoja darowizna prawdopodobnie nie podlega odliczeniu od podatku (chyba, że "
+"płacisz podatki od dochodów U.S), ale bylibyśmy bardzo wdzięczni za Twoje 
"
+"wsparcie."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:276
 msgid ""
@@ -1632,6 +1652,8 @@ msgid ""
 "(Also, if you wanted, you could give us $4,999 in late 2018 and $4,999 in "
 "early 2019.)"
 msgstr ""
+"(Ponadto, jeśli chcesz, możesz dać nam $4,999 pod koniec 2018 i $4,999 na "
+"początku 2019.)"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:403
 msgid ""
@@ -1662,6 +1684,8 @@ msgid ""
 "However, we will never publicly identify you as a donor, unless you have "
 "given us permission to do so."
 msgstr ""
+"Jednakże nigdy nie będziemy publicznie identyfikować Cię jako darczyńcy, 
"
+"chyba że wyraziłeś na to zgodę."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:415
 msgid ""
@@ -1669,24 +1693,35 @@ msgid ""
 "do anything else that would publicly identify you as someone who has "
 "donated."
 msgstr ""
+"Oznacza to, że nie zamieścimy Twojego imienia i nazwiska na naszej stronie "
+"internetowej, nie podziękujemy Ci na Twitterze ani nie zrobimy nic innego, "
+"co pozwoliłoby publicznie zidentyfikować Cię jako osobę, która 
przekazała "
+"dotacje."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:417
 msgid ""
 "If we decide we would like to publicly name you as a donor, we will ask you "
 "first, and will not do it until and unless you say it's okay."
 msgstr ""
+"Jeśli zdecydujemy, że chcielibyśmy publicznie wymienić Cię jako 
darczyńcę, "
+"zapytamy Cię najpierw i nie zrobimy tego do czasu, aż powiesz, że jest to 
w "

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit b200fd221430135b28384598ab89ce98276bc6e7
Author: Translation commit bot 
Date:   Thu Jun 13 08:20:27 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-ca.md | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/tor-outreach2019-2020-ca.md b/tor-outreach2019-2020-ca.md
index 897f0a8f1..bb41c2584 100644
--- a/tor-outreach2019-2020-ca.md
+++ b/tor-outreach2019-2020-ca.md
@@ -76,15 +76,15 @@ Després de cerca per la web, troba un fòrum i llegeix 
sobre xarxes privades vi
 
 El Jean perd hora i mitja intentant imaginar quin dels VPN barats és millor.
 
-En tria un i per un moment sembla que funciona, però després de 5 minuts, la 
connexió fall i la VPN ja no connecta més.
+En va triar un i per un moment va semblar que funciona, però després de 5 
minuts, la connexió va fallar i la VPN ja no connectava més.
 
 Jean kept reading to find other options and learned about Tor Browser and how 
it can circumvent censorship.
 
-He found an official website mirror to download the program.
+Va trobar un mirall del lloc web oficial d'on baixar el programa.
 
 When he opened **Tor Browser**, he followed the prompts for censored users and 
connected to a bridge which allowed him to access the internet again.
 
-With Tor Browser, Jean can browse freely and privately and contact his family. 
+Amb el navegador Tor, el Jean pot navegar lliurement i privada i contactar amb 
la seva família.
 
 ### Censored users all over the world rely on Tor Browser for a free, stable, 
and uncensored way to access the internet.
 
@@ -109,13 +109,13 @@ L'Amal vol visitar el lloc web del Bekele de forma 
privada, per  tant obre el na
 
 Tor Browser selects a random circuit of three relays, which are computers all 
over the world configured to route traffic over the Tor network.
 
-Tor Browser then encrypts her website request three times and sends it to the 
first Tor relay in her circuit.
+El navegador Tor xifra la petició del lloc web tres vegades i ho envia al 
primer repetidor Tor del circuit.
 
 El primer repetidor suprimeix la primera capa de xifratge però no aprèn que 
la destinació és el lloc web del Bekele.
 
-The first relay learns only the next location in the circuit, which is the 
second relay.
+El primer repetidor només sap la ubicació següent en el circuit, que és el 
segon repetidor.
 
-The second relay removes another encryption layer and forwards the web page 
request to the third relay.
+El segon repetidor suprimeix una altra cap de xifratge i reenvia la petició 
de la pàgina web al tercer repetidor.
 
 The third relay removes the last encryption layer and forwards the web page 
request to its destination, Bekele’s website, but it doesn't know the request 
comes from Amal.
 
@@ -131,7 +131,7 @@ Tor helps protect journalists, human rights defenders, 
domestic violence victims
 
 Tor is designed for privacy. We don’t know who our users are, and we don't 
keep logs of user activity.
 
-Tor relay operators cannot reveal the true identity of Tor users.
+Els operadors de repetidors Tor no poden revelar la identitat real dels 
usuaris Tor.
 
 Continual peer review of Tor's source code by academic and open source 
communities ensures that there are no backdoors in Tor, and our social contract 
promises that we will never backdoor Tor. 
 
@@ -139,7 +139,7 @@ Continual peer review of Tor's source code by academic and 
open source communiti
 
 Tor is made possible by a diverse set of users, developers, relay operators, 
and advocates from around the world.
 
-We need your help to make Tor more usable and secure for people everywhere.
+Ens cal la vostra ajuda per a fer Tor més usable i segur per a tothom.
 
 You can volunteer with Tor by writing code, running a relay, creating 
documentation, offering user support, or telling people in your community about 
Tor.
 

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

[tor-commits] [translation/donatepages-messagespot] Update translations for donatepages-messagespot

[translation]

commit affb44a20ef3c7d765aa75bf3eefc2735d45b222
Author: Translation commit bot 
Date:   Thu Jun 13 08:15:38 2019 +

Update translations for donatepages-messagespot
---
 locale/pl/LC_MESSAGES/messages.po | 19 ++-
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/locale/pl/LC_MESSAGES/messages.po 
b/locale/pl/LC_MESSAGES/messages.po
index 1d4f0d7f9..bdd09eb3e 100644
--- a/locale/pl/LC_MESSAGES/messages.po
+++ b/locale/pl/LC_MESSAGES/messages.po
@@ -445,7 +445,7 @@ msgstr "Suma wpłat"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:159
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:119
 msgid "Total Raised with Mozilla's Match"
-msgstr ""
+msgstr "Zebrana Suma Razem z Wyrównaniem Mozilli"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:170
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:176
@@ -468,7 +468,7 @@ msgstr "miesięcznie"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:345
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:304
 msgid "Want to donate Bitcoin, Stock, or via snail mail?"
-msgstr ""
+msgstr "Chcesz przekazać Bitcoin, Stock, czy za pośrednictwem poczty?"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:201
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:166
@@ -533,7 +533,7 @@ msgstr "WYŁĄCZONY"
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:267
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:226
 msgid "Get our limited edition Tor: Strength in Numbers shirt."
-msgstr ""
+msgstr "Zdobądź naszą limitowaną koszulkę Tor: Strength in Numbers."
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:278
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:237
@@ -628,7 +628,7 @@ msgstr ""
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:411
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:370
 msgid "Start sending me email updates about the Tor Project!"
-msgstr ""
+msgstr "Zacznij wysyłać mi emailem aktualizacje dotyczące Tor Project!"
 
 #: 
tmp/cache_locale/93/936f5ca9f26662b60293a725343573df95cb28c99d7c3f12b1c94ed37a453012.php:418
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:377
@@ -774,7 +774,7 @@ msgstr ""
 #: 
tmp/cache_locale/04/0421bb9119a5b92b0e2e4a49c25d718283ccfa1495534b2a08ff967a0f4fd06a.php:616
 #: 
tmp/cache_locale/03/03963079e40d8bba608baf2120533e119d90cb2cfc82fee9e293708eb548373f.php:84
 msgid "Mozilla will match your gift and double your impact."
-msgstr ""
+msgstr "Mozilla wyrówna twój prezent i podwoi twój wpływ."
 
 #: 
tmp/cache_locale/70/70a3de9c7fb70a68cae132efaa24457b72f71189189cd4c8c492f3cd459b6483.php:61
 msgid "Want to donate by credit card or PayPal?"
@@ -1884,6 +1884,7 @@ msgstr ""
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:556
 msgid "Can I donate my airline miles, flight vouchers, or hotel points?"
 msgstr ""
+"Czy mogę przekazać mile lotnicze, kupony lotnicze lub punkty hotelowe?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:562
 msgid ""
@@ -1964,11 +1965,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:610
 msgid "You don't support my preferred way to donate."
-msgstr ""
+msgstr "Nie wspieracie mojego preferowanego sposobu dotacji."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:612
 msgid "Can I recommend a new donation method to you?"
-msgstr ""
+msgstr "Czy mogę polecić wam nową metodę dotacji?"
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:616
 msgid "Sure."
@@ -1988,11 +1989,11 @@ msgstr ""
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:628
 msgid "We do reserve the right to reject a donation."
-msgstr ""
+msgstr "Zastrzegamy sobie prawo do odrzucenia darowizny."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:630
 msgid "To date though, we haven't exercised that right."
-msgstr ""
+msgstr "Do tej pory nie skorzystaliśmy z tego prawa."
 
 #: 
tmp/cache_locale/4a/4ab2d928dab25aeb8c96bb2d1c2ad651173d6c029f40a442edf6925bfd038cd2.php:632
 msgid "We are happy that a broad range of people use and support Tor."

___
tor-commits 

[tor-commits] [translation/tor_outreach_md] Update translations for tor_outreach_md

[translation]

commit a00783ed3407bf3fd62cbc0042271943f65bf167
Author: Translation commit bot 
Date:   Thu Jun 13 07:20:24 2019 +

Update translations for tor_outreach_md
---
 tor-outreach2019-2020-ca.md | 20 ++--
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/tor-outreach2019-2020-ca.md b/tor-outreach2019-2020-ca.md
index 86593620a..897f0a8f1 100644
--- a/tor-outreach2019-2020-ca.md
+++ b/tor-outreach2019-2020-ca.md
@@ -32,7 +32,7 @@ De fet, la Fernanda usa el **navegador Tor** per a qualsevol 
navegació web que
 
 També usa una aplicació basada en Tor anomenada **OnionShare** per a enviar 
fitxers a altres activistes de forma segura i privada.
 
-### Reproductive rights activists like Fernanda are fighting for fundamental 
freedoms, and Tor helps power their resistance.
+### Els activistes sobre els drets de reproducció com la Fernanda lluiten per 
les llibertats individuals i Tor els ajuda en la seva resistència.
 
 ---
 
@@ -50,7 +50,7 @@ Private security firms, paid for by these companies, use 
powerful surveillance m
 
 Jelani uses **Tor Browser** to prevent these companies from watching as he 
visits websites for international human rights protection and legal aid and 
writes blog posts about the resistance movement in his village.
 
-He also uses **OnionShare** and **SecureDrop** to securely send documents to 
journalists who are helping expose these human rights violations.
+També usa **OnionShare** i **SecureDrop** per a enviar de forma segura 
documents a periodistes que ajuden a denunciar aquestes violacions de drets 
humans.
 
 All of this software uses Tor to help protect Jelani’s privacy. 
 
@@ -62,21 +62,21 @@ All of this software uses Tor to help protect Jelani’s 
privacy.
 
 ### Construïu ponts i no murs
 
-Jean was traveling for the first time to a country far from his family.
+El Jean era de viatge a l'estranger, per primera vegada lluny de la família.
 
-After arriving at a hotel, he opened his laptop.
+Després d'arribar a un hotel, va obrir el portàtil
 
 He was so exhausted that when the message "Connection has timed out" first 
appeared on his web browser, he thought it was due to his own error.
 
-But after trying again and again, he realized that his email provider, a news 
website, and many apps were unavailable. 
+Després d'intentar-ho una vegada i una altra, va adonar-se que el seu 
proveïdor de correu, un lloc de notícies, i moltes altres aplicacions, no 
són disponibles.
 
-He had heard that this country censors the internet and wondered if that was 
happening.
-How could he contact his family from behind this impenetrable wall?
-After doing some web searches, he found a forum and read about VPNs, private 
services that allow you to connect to another uncensored network.
+Ha sentit que aquest país censura Internet i es pregunta si això és el que 
està passant.
+Com pot contactar amb la seva família des d'aquest mur impenetrable?
+Després de cerca per la web, troba un fòrum i llegeix sobre xarxes privades 
virtuals, serveis privats que us permeten connectar a altres xarxes no 
censurades.
 
-Jean spent half an hour trying to figure out which cheap VPN was best.
+El Jean perd hora i mitja intentant imaginar quin dels VPN barats és millor.
 
-He chose one and for a moment it seemed to work, but after five minutes the 
connection went offline and the VPN would no longer connect. 
+En tria un i per un moment sembla que funciona, però després de 5 minuts, la 
connexió fall i la VPN ja no connecta més.
 
 Jean kept reading to find other options and learned about Tor Browser and how 
it can circumvent censorship.
 

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