commit a307c3aca17e19b00fd622f5b9621f7ee9b146f3
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 14:53:01 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tor-launcher-proper…
---
en-GB/torlauncher.properties | 161 ++++++++++++++++++++++---------------------
1 file changed, 81 insertions(+), 80 deletions(-)
diff --git a/en-GB/torlauncher.properties b/en-GB/torlauncher.properties
index ca9774bc42..e77f00e09f 100644
--- a/en-GB/torlauncher.properties
+++ b/en-GB/torlauncher.properties
@@ -1,94 +1,95 @@
-### Copyright (c) 2016, The Tor Project, Inc.
+### Copyright (c) 2020, The Tor Project, Inc.
### See LICENSE for licensing information.
-torlauncher.error_title=Tor Launcher
+# torlauncher.error_title=Tor Launcher
-torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
-torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
-torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
-torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
-torlauncher.tor_failed_to_start=Tor failed to start.
-torlauncher.tor_control_failed=Failed to take control of Tor.
-torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
-torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
+# torlauncher.tor_exited_during_startup=Tor exited during startup. This might be due to an error in your torrc file, a bug in Tor or another program on your system, or faulty hardware. Until you fix the underlying problem and restart Tor, Tor Browser will not start.
+# torlauncher.tor_exited=Tor unexpectedly exited. This might be due to a bug in Tor itself, another program on your system, or faulty hardware. Until you restart Tor, the Tor Browser will not able to reach any websites. If the problem persists, please send a copy of your Tor Log to the support team.
+# torlauncher.tor_exited2=Restarting Tor will not close your browser tabs.
+# torlauncher.tor_controlconn_failed=Could not connect to Tor control port.
+# torlauncher.tor_failed_to_start=Tor failed to start.
+# torlauncher.tor_control_failed=Failed to take control of Tor.
+# torlauncher.tor_bootstrap_failed=Tor failed to establish a Tor network connection.
+# torlauncher.tor_bootstrap_failed_details=%1$S failed (%2$S).
-torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
-torlauncher.tor_missing=The Tor executable is missing.
-torlauncher.torrc_missing=The torrc file is missing and could not be created.
-torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
-torlauncher.password_hash_missing=Failed to get hashed password.
+# torlauncher.unable_to_start_tor=Unable to start Tor.\n\n%S
+# torlauncher.tor_missing=The Tor executable is missing.
+# torlauncher.torrc_missing=The torrc file is missing and could not be created.
+# torlauncher.datadir_missing=The Tor data directory does not exist and could not be created.
+# torlauncher.onionauthdir_missing=The Tor onion authentication directory does not exist and could not be created.
+# torlauncher.password_hash_missing=Failed to get hashed password.
-torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
-torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
-torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
+# torlauncher.failed_to_get_settings=Unable to retrieve Tor settings.\n\n%S
+# torlauncher.failed_to_save_settings=Unable to save Tor settings.\n\n%S
+# torlauncher.ensure_tor_is_running=Please ensure that Tor is running.
-torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
-torlauncher.error_proxy_type_missing=You must select the proxy type.
-torlauncher.error_bridges_missing=You must specify one or more bridges.
-torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
-torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
-torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
+# torlauncher.error_proxy_addr_missing=You must specify both an IP address or hostname and a port number to configure Tor to use a proxy to access the Internet.
+# torlauncher.error_proxy_type_missing=You must select the proxy type.
+# torlauncher.error_bridges_missing=You must specify one or more bridges.
+# torlauncher.error_default_bridges_type_missing=You must select a transport type for the provided bridges.
+# torlauncher.error_bridgedb_bridges_missing=Please request a bridge.
+# torlauncher.error_bridge_bad_default_type=No provided bridges that have the transport type %S are available. Please adjust your settings.
-torlauncher.bridge_suffix.meek-amazon=(works in China)
-torlauncher.bridge_suffix.meek-azure=(works in China)
+# torlauncher.bridge_suffix.meek-amazon=(works in China)
+# torlauncher.bridge_suffix.meek-azure=(works in China)
-torlauncher.request_a_bridge=Request a Bridge…
-torlauncher.request_a_new_bridge=Request a New Bridge…
-torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
-torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
-torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
-torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
-torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
-torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
+# torlauncher.request_a_bridge=Request a Bridge…
+# torlauncher.request_a_new_bridge=Request a New Bridge…
+# torlauncher.contacting_bridgedb=Contacting BridgeDB. Please wait.
+# torlauncher.captcha_prompt=Solve the CAPTCHA to request a bridge.
+# torlauncher.bad_captcha_solution=The solution is not correct. Please try again.
+# torlauncher.unable_to_get_bridge=Unable to obtain a bridge from BridgeDB.\n\n%S
+# torlauncher.no_meek=This browser is not configured for meek, which is needed to obtain bridges.
+# torlauncher.no_bridges_available=No bridges are available at this time. Sorry.
-torlauncher.connect=Connect
-torlauncher.restart_tor=Restart Tor
-torlauncher.quit=Quit
-torlauncher.quit_win=Exit
-torlauncher.done=Done
+# torlauncher.connect=Connect
+# torlauncher.restart_tor=Restart Tor
+# torlauncher.quit=Quit
+# torlauncher.quit_win=Exit
+# torlauncher.done=Done
-torlauncher.forAssistance=For assistance, contact %S
-torlauncher.forAssistance2=For assistance, visit %S
+# torlauncher.forAssistance=For assistance, contact %S
+# torlauncher.forAssistance2=For assistance, visit %S
-torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
+# torlauncher.copiedNLogMessages=Copy complete. %S Tor log messages are ready to be pasted into a text editor or an email message.
-torlauncher.bootstrapStatus.starting=Starting
-torlauncher.bootstrapStatus.conn_pt=Connecting to bridge
-torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge
-torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy
-torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy
-torlauncher.bootstrapStatus.conn=Connecting to a Tor relay
-torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay
-torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay
-torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay
-torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
-torlauncher.bootstrapStatus.requesting_status=Retrieving network status
-torlauncher.bootstrapStatus.loading_status=Loading network status
-torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
-torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
-torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
-torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information
-torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge
-torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge
-torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy
-torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy
-torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay
-torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay
-torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay
-torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay
-torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit
-torlauncher.bootstrapStatus.done=Connected to the Tor network!
+# torlauncher.bootstrapStatus.starting=Starting
+# torlauncher.bootstrapStatus.conn_pt=Connecting to bridge
+# torlauncher.bootstrapStatus.conn_done_pt=Connected to bridge
+# torlauncher.bootstrapStatus.conn_proxy=Connecting to proxy
+# torlauncher.bootstrapStatus.conn_done_proxy=Connected to proxy
+# torlauncher.bootstrapStatus.conn=Connecting to a Tor relay
+# torlauncher.bootstrapStatus.conn_done=Connected to a Tor relay
+# torlauncher.bootstrapStatus.handshake=Negotiating with a Tor relay
+# torlauncher.bootstrapStatus.handshake_done=Finished negotiating with a Tor relay
+# torlauncher.bootstrapStatus.onehop_create=Establishing an encrypted directory connection
+# torlauncher.bootstrapStatus.requesting_status=Retrieving network status
+# torlauncher.bootstrapStatus.loading_status=Loading network status
+# torlauncher.bootstrapStatus.loading_keys=Loading authority certificates
+# torlauncher.bootstrapStatus.requesting_descriptors=Requesting relay information
+# torlauncher.bootstrapStatus.loading_descriptors=Loading relay information
+# torlauncher.bootstrapStatus.enough_dirinfo=Finished loading relay information
+# torlauncher.bootstrapStatus.ap_conn_pt=Building circuits: Connecting to bridge
+# torlauncher.bootstrapStatus.ap_conn_done_pt=Building circuits: Connected to bridge
+# torlauncher.bootstrapStatus.ap_conn_proxy=Building circuits: Connecting to proxy
+# torlauncher.bootstrapStatus.ap_conn_done_proxy=Building circuits: Connected to proxy
+# torlauncher.bootstrapStatus.ap_conn=Building circuits: Connecting to a Tor relay
+# torlauncher.bootstrapStatus.ap_conn_done=Building circuits: Connected to a Tor relay
+# torlauncher.bootstrapStatus.ap_handshake=Building circuits: Negotiating with a Tor relay
+# torlauncher.bootstrapStatus.ap_handshake_done=Building circuits: Finished negotiating with a Tor relay
+# torlauncher.bootstrapStatus.circuit_create=Building circuits: Establishing a Tor circuit
+# torlauncher.bootstrapStatus.done=Connected to the Tor network!
-torlauncher.bootstrapWarning.done=done
-torlauncher.bootstrapWarning.connectrefused=connection refused
-torlauncher.bootstrapWarning.misc=miscellaneous
-torlauncher.bootstrapWarning.resourcelimit=insufficient resources
-torlauncher.bootstrapWarning.identity=identity mismatch
-torlauncher.bootstrapWarning.timeout=connection timeout
-torlauncher.bootstrapWarning.noroute=no route to host
-torlauncher.bootstrapWarning.ioerror=read/write error
-torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
+# torlauncher.bootstrapWarning.done=done
+# torlauncher.bootstrapWarning.connectrefused=connection refused
+# torlauncher.bootstrapWarning.misc=miscellaneous
+# torlauncher.bootstrapWarning.resourcelimit=insufficient resources
+# torlauncher.bootstrapWarning.identity=identity mismatch
+# torlauncher.bootstrapWarning.timeout=connection timeout
+# torlauncher.bootstrapWarning.noroute=no route to host
+# torlauncher.bootstrapWarning.ioerror=read/write error
+# torlauncher.bootstrapWarning.pt_missing=missing pluggable transport
-torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
-torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
-torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
+# torlauncher.nsresult.NS_ERROR_NET_RESET=The connection to the server was lost.
+# torlauncher.nsresult.NS_ERROR_CONNECTION_REFUSED=Could not connect to the server.
+# torlauncher.nsresult.NS_ERROR_PROXY_CONNECTION_REFUSED=Could not connect to the proxy.
commit e51c8c3b5c92d99d6417419123396929ccc48411
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 14:51:40 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=torbutton-torbutton…
---
en-GB/torbutton.properties | 12 ++++++++++++
1 file changed, 12 insertions(+)
diff --git a/en-GB/torbutton.properties b/en-GB/torbutton.properties
index d83cae0ccf..a173f85319 100644
--- a/en-GB/torbutton.properties
+++ b/en-GB/torbutton.properties
@@ -61,6 +61,7 @@
# Onion services strings. Strings are kept here for ease of translation.
# LOCALIZATION NOTE: %S will be replaced with the .onion address.
+# onionServices.learnMore=Learn more
# onionServices.clientAuthMissing=Tor onion service missing client authorization
# onionServices.authPrompt.description=%S is requesting your private key.
# onionServices.authPrompt.keyPlaceholder=Enter your private key for this onion service
@@ -68,3 +69,14 @@
# onionServices.authPrompt.doneAccessKey=d
# onionServices.authPrompt.invalidKey=Please enter a valid key (52 base32 characters or 44 base64 characters)
# onionServices.authPrompt.failedToSetKey=Unable to configure Tor with your key
+# onionServices.authPreferences.header=Onion Services Authentication
+# onionServices.authPreferences.overview=Some onion services require that you identify yourself with a key (a kind of password) before you can access them.
+# onionServices.authPreferences.savedKeys=Saved Keys…
+# onionServices.authPreferences.dialogTitle=Onion Service Keys
+# onionServices.authPreferences.dialogIntro=Keys for the following onionsites are stored on your computer
+# onionServices.authPreferences.onionSite=Onionsite
+# onionServices.authPreferences.onionKey=Key
+# onionServices.authPreferences.remove=Remove
+# onionServices.authPreferences.removeAll=Remove All
+# onionServices.authPreferences.failedToGetKeys=Unable to retrieve keys from tor
+# onionServices.authPreferences.failedToRemoveKey=Unable to remove key
commit dcbb372f7803ef36f70bdbd893a68f282648f4af
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 14:45:15 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=bridgedb
---
en_GB/LC_MESSAGES/bridgedb.po | 19 ++++++++-----------
1 file changed, 8 insertions(+), 11 deletions(-)
diff --git a/en_GB/LC_MESSAGES/bridgedb.po b/en_GB/LC_MESSAGES/bridgedb.po
index 941e75b2b8..51981d9b8d 100644
--- a/en_GB/LC_MESSAGES/bridgedb.po
+++ b/en_GB/LC_MESSAGES/bridgedb.po
@@ -3,16 +3,16 @@
# This file is distributed under the same license as the bridgedb project.
#
# Translators:
-# Andi Chandler <andi(a)gowling.com>, 2014-2015,2019
+# Andi Chandler <andi(a)gowling.com>, 2014-2015,2019-2020
# Richard Shaylor <rshaylor(a)me.com>, 2014
# ronnietse <tseronnie(a)ymail.com>, 2014
msgid ""
msgstr ""
"Project-Id-Version: Tor Project\n"
"Report-Msgid-Bugs-To: 'https://trac.torproject.org/projects/tor/newticket?component=BridgeDB&keywo…'\n"
-"POT-Creation-Date: 2020-02-04 10:59-0800\n"
-"PO-Revision-Date: 2020-02-05 01:11+0000\n"
-"Last-Translator: carolyn <carolyn(a)anhalt.org>\n"
+"POT-Creation-Date: 2020-02-18 13:39-0800\n"
+"PO-Revision-Date: 2020-02-28 14:25+0000\n"
+"Last-Translator: Andi Chandler <andi(a)gowling.com>\n"
"Language-Team: English (United Kingdom) (http://www.transifex.com/otf/torproject/language/en_GB/)\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -45,13 +45,10 @@ msgstr ""
#. "BridgeDB"
#. "pluggable transport"
#. "pluggable transports"
-#. "obfs2"
-#. "obfs3"
-#. "scramblesuit"
-#. "fteproxy"
+#. "obfs4"
#. "Tor"
#. "Tor Browser"
-#: bridgedb/distributors/https/server.py:138
+#: bridgedb/distributors/https/server.py:135
msgid "Sorry! Something went wrong with your request."
msgstr "Sorry! Something went wrong with your request."
@@ -272,7 +269,7 @@ msgid ""
"\n"
msgstr "Additionally, BridgeDB has plenty of plain old vanilla bridges %s without any\nPluggable Transports %s which maybe doesn't sound as cool, but they can still\nhelp to circumvent internet censorship in many cases.\n"
-#: bridgedb/strings.py:101 bridgedb/test/test_https.py:383
+#: bridgedb/strings.py:101 bridgedb/test/test_https.py:356
msgid "What are bridges?"
msgstr "What are bridges?"
@@ -293,7 +290,7 @@ msgid ""
"empty and write \"get transport obfs4\" in the email's message body. Please note\n"
"that you must send the email using an address from one of the following email\n"
"providers: %s or %s."
-msgstr ""
+msgstr "Another way to get bridges is to send an email to %s. Leave the email subject\nempty and write \"get transport obfs4\" in the email's message body. Please note\nthat you must send the email using an address from one of the following email\nproviders: %s or %s."
#: bridgedb/strings.py:117
msgid "My bridges don't work! I need help!"
commit 59aa4ccf9e864605b8bd3a1a19eda72c81f3036e
Author: Pili Guerra <pili(a)piliguerra.com>
Date: Fri Feb 28 15:33:44 2020 +0100
Initial content skeleton
---
content/anti-censorship/contents.lr | 21 ++++++++++++++++
content/applications/contents.lr | 21 ++++++++++++++++
content/metrics/contents.lr | 21 ++++++++++++++++
content/network-health/contents.lr | 48 +++++++++++++++++++++++++++++++++++++
content/network/contents.lr | 21 ++++++++++++++++
content/project-ideas/contents.lr | 23 ++++++++++++++++++
content/tor-ecosystem/contents.lr | 17 +++++++++++++
templates/gsoc.html | 24 +++++++++++++++++++
templates/home.html | 26 ++++++++++++++++----
templates/macros/projects.html | 24 +++++++++++++++++++
10 files changed, 241 insertions(+), 5 deletions(-)
diff --git a/content/anti-censorship/contents.lr b/content/anti-censorship/contents.lr
new file mode 100644
index 0000000..c1259a3
--- /dev/null
+++ b/content/anti-censorship/contents.lr
@@ -0,0 +1,21 @@
+section: anti-censorship
+---
+section_id: anti-censorship
+---
+color: primary
+---
+_template: layout.html
+---
+title: Anti-Censorship Team
+---
+subtitle: The anti-censorship team is a group of Tor people who make Tor reachable anywhere in the world.
+---
+key: 1
+---
+html: training.html
+---
+body:
+
+Welcome to the anti-censorship team page!
+
+The anti-censorship team is a group of Tor people who make Tor reachable anywhere in the world. We analyze censorship attempts and develop technology to work around these censorship attempts.
\ No newline at end of file
diff --git a/content/applications/contents.lr b/content/applications/contents.lr
new file mode 100644
index 0000000..8e44939
--- /dev/null
+++ b/content/applications/contents.lr
@@ -0,0 +1,21 @@
+section: applications
+---
+section_id: applications
+---
+color: primary
+---
+_template: layout.html
+---
+title: Applications Team
+---
+subtitle: The Applications Team is a group of Tor people who are working on different user facing products.
+---
+key: 2
+---
+html: training.html
+---
+body:
+
+Welcome to the Applications Team page.
+
+The Applications Team is a group of Tor people who are working on different user facing products: Tor Browser, Tor Messenger, Tor Mail, Orbot etc.
\ No newline at end of file
diff --git a/content/metrics/contents.lr b/content/metrics/contents.lr
new file mode 100644
index 0000000..e870b2c
--- /dev/null
+++ b/content/metrics/contents.lr
@@ -0,0 +1,21 @@
+section: metrics
+---
+section_id: metrics
+---
+color: primary
+---
+_template: layout.html
+---
+title: Metrics Team
+---
+subtitle: The Metrics Team is a group of Tor people who care about measuring and analyzing things in the public Tor network.
+---
+key: 3
+---
+html: training.html
+---
+body:
+
+Welcome to the Metrics Team page!
+
+The Metrics Team is a group of Tor people who care about measuring and analyzing things in the public Tor network. If you're interested in measurements and analyses, the Metrics Team is what you're looking for. Welcome!
\ No newline at end of file
diff --git a/content/network-health/contents.lr b/content/network-health/contents.lr
new file mode 100644
index 0000000..5bf3b54
--- /dev/null
+++ b/content/network-health/contents.lr
@@ -0,0 +1,48 @@
+section: network-health
+---
+section_id: network-health
+---
+color: primary
+---
+_template: layout.html
+---
+title: Network Health Team
+---
+subtitle: The Network Health Team coordinates network performance and scalability work as well as other network health related tasks.
+---
+key: 5
+---
+html: training.html
+---
+body:
+
+Welcome to the Network Health Team page!
+
+The team was created on January 2020 and it works on these five areas:
+
+1. track community standards about what makes a good relay
+ - publish up-to-date expectations for relay operators
+ - set best practices for how to set relay families
+ - detect and resolve bad relays
+ - exitmap, sybil detection, hsdir traps
+2. anomaly analysis / network health engineer [with network team]
+ - establish baselines of expected network behavior
+ - look for and resolve denial of service issues
+ - track connectivity issues between relays
+ - look for relays hitting resource limits
+3. make sure usage/growth stats are collected and accurate
+ - track network performance, relay diversity by various metrics
+ - count users [with network team and metrics team]
+ - monitor bridge growth and usage [with censorship team]
+4. relay advocacy [with community team]
+ - maintain docs for setting up and running relays and bridges
+ - grow a cohesive community of relay operators so they have peers
+ - keep relays on the right tor versions
+ - relaunch a gamification / badge system for lauding good relay progress
+ - strengthen relationships with non-profit orgs that run relays
+ - help companies that want to offset their tor network load
+5. maintain the components of the network
+ - maintain directory authority relationships
+ - keep bandwidth authorities working (including setting the right balance between speed and location diversity)
+ - have enough tor browser default bridges, and keep them running smoothly [with censorship team]
+ - update the fallbackdirs list
\ No newline at end of file
diff --git a/content/network/contents.lr b/content/network/contents.lr
new file mode 100644
index 0000000..6eed72a
--- /dev/null
+++ b/content/network/contents.lr
@@ -0,0 +1,21 @@
+section: network
+---
+section_id: network
+---
+color: primary
+---
+_template: layout.html
+---
+title: Network Team
+---
+subtitle: The Network Team is a group of Tor people who are working on the Tor back-end.
+---
+key: 4
+---
+html: training.html
+---
+body:
+
+Welcome to the Network Team page!
+
+The Network Team is a group of Tor people who are working on Tor back-end: the program called tor, the network simulators, the scripts that support directory authorities, onion services, etc. Basically, everything that sends and receives bytes from the network.
\ No newline at end of file
diff --git a/content/project-ideas/contents.lr b/content/project-ideas/contents.lr
new file mode 100644
index 0000000..e56ab2b
--- /dev/null
+++ b/content/project-ideas/contents.lr
@@ -0,0 +1,23 @@
+_template: layout.html
+---
+_undiscoverable: true
+---
+section: GSoC
+---
+section_id: gsoc
+---
+html: gsoc.html
+---
+color: primary
+---
+subtitle: Some project ideas for GSoC.
+---
+cta: Get coding
+---
+key: 0
+---
+title: Project Ideas
+---
+body:
+
+You may find some of these projects to be good ideas for Google Summer of Code. We have labelled each idea with which of our core developers would be good mentors. If one or more of these ideas looks promising to you, please [contact us](mailto:gso+c@torproject.org) to discuss your plans rather than sending blind applications.
diff --git a/content/tor-ecosystem/contents.lr b/content/tor-ecosystem/contents.lr
new file mode 100644
index 0000000..489ce1a
--- /dev/null
+++ b/content/tor-ecosystem/contents.lr
@@ -0,0 +1,17 @@
+section: tor-ecosystem
+---
+section_id: tor-ecosystem
+---
+color: primary
+---
+_template: layout.html
+---
+title: Tor Ecosystem
+---
+subtitle: Here are some other organisations and teams that form part of the wider Tor Ecosystem
+---
+key: 6
+---
+html: training.html
+---
+body:
\ No newline at end of file
diff --git a/templates/gsoc.html b/templates/gsoc.html
new file mode 100644
index 0000000..15f388d
--- /dev/null
+++ b/templates/gsoc.html
@@ -0,0 +1,24 @@
+<div class="container py-5">
+ <div class="row py-5">
+ <div class="col-lg-12">
+ {{ this.body }}
+ </div>
+ </div>
+ <div class="col-12">
+ {% from "macros/projects.html" import render_active %}
+ {% for child in this.children.filter(F.active == True).all() %}
+ <div class="row">
+ {{ render_active(child, this.alt) }}
+ </div>
+ {% endfor %}
+ </div>
+ <div class="row">
+ <ul>
+ {% for child in this.children.filter(F.active == False).all() %}
+ <li>{{ item.title }}</li>
+ {% endfor %}
+ </div>
+ <div class="row py-5 text-center mx-auto">
+ <p class="text-center">{{ _('None of these ideas seem appealing? You may also want to propose your own project idea — which often results in the best projects.') }} <a href="mailto:gso@torproject.org">{{ _('We invite you to contact us to discuss your own project idea.') }}</a></p>
+ </div>
+</div>
diff --git a/templates/home.html b/templates/home.html
index 8b6f12f..a63f9ad 100644
--- a/templates/home.html
+++ b/templates/home.html
@@ -7,21 +7,37 @@
<section>
<div class="container">
<div class="row">
- {% for child in this.children|sort(attribute='key') %}
+ {% for child in site.query('/').filter(F.section_id != 'gsoc')|sort(attribute='key') %}
<div class="col-sm-6 col-md-4 col-sm-12 col-xl-4 py-4">
<div class="card h-100 p-2">
<div class="card-body">
<h2 class="card-title ">{{ child.title }}</h2>
<p class="card-text">{{ child.subtitle }}</p>
- <div class="illo-container">
- <img src="/static/images/home/png/{{ child.section_id }}.png" class="img-fluid" alt="{{ child.section }}" />
- </div>
</div>
- <a href="{{ child.path|url }}" class="btn btn-primary">{{ child.cta }}</a>
+ <a href="{{ child.path|url }}" class="btn btn-primary">Learn More</a>
</div>
</div>
{% endfor %}
</div>
+ <div class="row py-5 text-center mx-auto">
+ <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Research') }}</h2>
+ <p class="text-center">
+ {{ _('Many people around the world are doing research on how to improve the Tor design, what\'s going on in the Tor network, and more generally on attacks and defenses for anonymous communication systems. Our research portal holds the resources we provide to help make your Tor research more effective.')}}
+ </p>
+ <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="https://research.torproject.org">
+ {{ _('Research Portal') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
+ </a>
+ </div>
+ </div>
+ <div class="row py-5 text-center mx-auto">
+ <h2 class="display-4 text-primary text-center mx-auto my-3">{{ _('Project Ideas') }}</h2>
+ <p class="text-center">
+ {{ _('Here you will find some projects that may be good ideas for Outreachy, Google Summer of Code or other internship programs we may participate in in future.')}}
+ </p>
+ <a class="btn btn-lg btn-outline-primary mx-auto my-3" href="/project-ideas">
+ {{ _('Learn More') }}<i class="ml-3 pt-2 fas fa-arrow-right"></i>
+ </a>
+ </div>
</div>
</section>
</div>
diff --git a/templates/macros/projects.html b/templates/macros/projects.html
new file mode 100644
index 0000000..a4e2850
--- /dev/null
+++ b/templates/macros/projects.html
@@ -0,0 +1,24 @@
+{% macro render_active(item, alternative) %}
+<div class="card border-0">
+ <div class="card-header bg-white border-0" id="headingOne">
+ <h5 class="mb-0">
+ <a href="{{ item.path|url }}">{{ item.title }}</a>
+ </h5>
+ Languages:
+ {% for lang in item.languages %}
+ <span class="badge badge-primary">{{ lang }}</span>
+ {% endfor %}
+ <br>
+ Mentors:
+ {% for person in item.mentors %}
+ <span class="badge badge-secondary">{{ person }}</span>
+ {% endfor %}
+ </div>
+ <div>
+ <div class="card-body">
+ {{ item.subtitle }}
+ <a href="{{ item.path|url }}">{{ _('Read more.') }}</a>
+ </div>
+ </div>
+</div>
+{% endmacro %}
commit f40c8b16213fe6f1a761a81303b18432682d08c8
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 14:15:30 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten…
---
contents+es.po | 15 +++++++++++++++
1 file changed, 15 insertions(+)
diff --git a/contents+es.po b/contents+es.po
index e148c4be34..1aa65ff4ec 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1012,6 +1012,8 @@ msgid ""
"Any abuse complaints about the exit will go directly to you (via your "
"hoster, depending on the WHOIS records)."
msgstr ""
+"Cualquier queja de abuso sobre el nodo de salida irá dirigido directamente a"
+" tí (a traves de tu proveedor, dependiendo del registro WHOIS)."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -1019,6 +1021,8 @@ msgid ""
"Generally, most complaints can be handled pretty easily through template "
"letters, which we'll discuss more in legal considerations section."
msgstr ""
+"Normalmente, la mayoría de quejas pueden ser atendidas fácilmente mediante "
+"plantillas, tema abordado en nuestra sección de consideraciones legales."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -1026,6 +1030,8 @@ msgid ""
"Because of the legal exposure that comes with running an exit relay, you "
"should not run a Tor exit relay from your home."
msgstr ""
+"A causa de la exposición legal que acarrea administrar un repetidor de "
+"salida, no deberías hacerlo desde casa."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -1033,6 +1039,9 @@ msgid ""
"Ideal exit relay operators are affiliated with some institution, like a "
"university, a library, a hackerspace or a privacy related organization."
msgstr ""
+"Lo ideal es que los administradores de repetidores de salida, estén "
+"afiliados a alguna organización, como una universidad, una biblioteca, un "
+"hackerspace o una organización que trabaja por la privacidad."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -1041,6 +1050,9 @@ msgid ""
"better positioned to handle abuse complaints or the rare law enforcement "
"inquiry."
msgstr ""
+"Una institución no solo puede proporcionar mayor ancho de banda para el nodo"
+" de salida, sino que también se encuentra en mejor posición para ocuparse de"
+" las quejas por abuso o los puntuales encuentros con las autoridades."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -1048,6 +1060,9 @@ msgid ""
"If you are considering running an exit relay, please read the [section on "
"legal considerations](/relay/community-resources) for exit relay operators."
msgstr ""
+"Si estás pensando en administrar un repetidor de salida, por favor, consulta"
+" la [sección sobre consideraciones legales](/relay/community-resources) para"
+" administradores de repetidores de salida."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
commit ad92db91e3ea29d563f8ee64e7f56b0a2393cf54
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 13:45:29 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten…
---
contents+es.po | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 50 insertions(+), 4 deletions(-)
diff --git a/contents+es.po b/contents+es.po
index 42d19d8067..e148c4be34 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -818,11 +818,15 @@ msgid ""
" insecure. Relays that attempt to downgrade to an insecure version will be "
"rejected from the network automatically."
msgstr ""
+"Por razones de seguridad, los repetidores Tor no deberían de rebajar su "
+"versión de tor desde una soportada hacia otra no soportada. Algunas "
+"versiones no soportadas son inseguras. Los repetidores que intenten rebajar "
+"la versión hacia una insegura serán expulsados de la red automáticamente."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.title)
msgid "Types of relays on the Tor network"
-msgstr ""
+msgstr "Tipos de repetidor en la red Tor"
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.subtitle)
@@ -830,6 +834,9 @@ msgid ""
"Bridges, guards, middle relays, and exits all serve important functions in "
"the Tor network. Learn about the different relays you can run."
msgstr ""
+"Puentes, guardianes, nodos intermedios y de salida. Todos ellos cumplen una "
+"función importante en la red Tor. Lee sobre los distintos tipos de repetidor"
+" que puedes poner en marcha."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -837,6 +844,8 @@ msgid ""
"All nodes are important, but they have different technical requirements and "
"legal implications."
msgstr ""
+"Todos los nodos son importantes, pero cada uno de ellos tiene distintos "
+"requisitos técnicos y distintas implicaciones legales."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -844,16 +853,18 @@ msgid ""
"Understanding the different kinds of nodes is the first step to learning "
"which one is right for you."
msgstr ""
+"Entender los distintos tipos de nodo es el primer paso para averiguar cual "
+"es el más idóneo para tí."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
msgid "# Guard and middle relay"
-msgstr ""
+msgstr "# Guardian y nodo intermedio"
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
msgid "(also known as non-exit relays)"
-msgstr ""
+msgstr "(también conocidos como repetidores no de salida)"
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -861,6 +872,8 @@ msgid ""
"A guard relay is the first relay in the chain of 3 relays building a Tor "
"circuit."
msgstr ""
+"Un repetidor guardián, es el primero en la cadena de 3 repetidores a la hora"
+" de construir un circuito Tor."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -868,6 +881,8 @@ msgid ""
"A middle relay is neither a guard nor an exit, but acts as the second hop "
"between the two."
msgstr ""
+"Un repetidor o nodo intermedio no es ni un guardián ni uno de salida, sino "
+"que actúa como el segundo salto entre los dos."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -875,11 +890,16 @@ msgid ""
"To become a guard, a relay has to be stable and fast (at least 2MByte/s) "
"otherwise it will remain a middle relay."
msgstr ""
+"Para convertise en un guardián, un repetidor tiene que funcionar de forma "
+"estable y ser rápido (al menos 2 MByte/s), de lo contrario, permanecerá como"
+" nodo intermedio."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
msgid "Guard and middle relays usually do not receive abuse complaints."
msgstr ""
+"Los guardianes y los nodos intermedios normalmente no reciben quejas por "
+"abuso."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -888,6 +908,9 @@ msgid ""
"blocked by certain services that don't understand how Tor works or "
"deliberately want to censor Tor users."
msgstr ""
+"Todos los repetidores aparecen en la lista pública de repetidores Tor, así "
+"que puede que algunos servicios los bloqueen si no entienden cómo funciona "
+"Tor o si de forma deliberada quieren censurar a los usuarios de Tor."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -896,6 +919,9 @@ msgid ""
" consider running a bridge instead so that your non-Tor traffic doesn't get "
"blocked as though it's coming from Tor."
msgstr ""
+"Si estás administrando un repetidor desde casa y dispones de dirección IP "
+"estática, podrías sopesar configurarlo como puente, ya que así, tu tráfico "
+"normal no sería bloqueado como si viniese de la red Tor."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -903,6 +929,8 @@ msgid ""
"If you have a dynamic IP address or multiple static IPs, this isn't as much "
"of an issue."
msgstr ""
+"Si tu dirección IP es dinámica o si dispones de varias direcciones IP, esto "
+"no supone mucho problema."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -911,6 +939,9 @@ msgid ""
"usage can be highly customized in the tor configuration (will be covered in "
"more detail later in this guide)."
msgstr ""
+"Un repetidor de no salida requiere muy poco esfuerzo por tu parte y el uso "
+"del ancho de banda puede ser ajustado en profundidad en la configuración de "
+"tor (la cual abordaremos con detalle más adelante)."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -918,16 +949,20 @@ msgid ""
"The so called \"exit policy\" of the relay decides if it is a relay allowing"
" clients to exit or not."
msgstr ""
+"La llamada \"política de salida\" del repetidor, establece si dicho "
+"repetidor permite que los clientes salgan a internet o no."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
msgid "A non-exit relay does not allow exiting in its exit policy."
msgstr ""
+"Un repetidor de no salida no permite la salida a internet en su \"política "
+"de salida\"."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
msgid "# Exit relay"
-msgstr ""
+msgstr "# Repetidor de salida"
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -935,6 +970,8 @@ msgid ""
"The exit relay is the final relay in a Tor circuit, the one that sends "
"traffic out its destination."
msgstr ""
+"El repetidor de salida es el último repetidor en un circuito Tor, el que "
+"envía el tráfico hacia su destino final."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -943,6 +980,9 @@ msgid ""
"provider, etc) will see the IP address of the exit relay instead of their "
"real IP address of the Tor user."
msgstr ""
+"Los servicios a los cuales los clientes Tor se conectan (página web, "
+"servicio de chat, proveedor de correo, etc) verán la dirección IP del "
+"repetidor de salida en lugar de la dirección IP real del usuario de Tor."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -950,6 +990,8 @@ msgid ""
"Exit relays have the greatest legal exposure and liability of all the "
"relays."
msgstr ""
+"Los repetidores de salida son los que más expuestos están a "
+"responsabilidades legales, comparados con los otros tipos."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
@@ -959,6 +1001,10 @@ msgid ""
"notice](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-"
"ba92-3d58c8345a32&?ref=sol08a2)."
msgstr ""
+"Por ejemplo, si un usuario descarga material con derechos de autor mientras "
+"usa tu repetidor de salida, tú como administrador puedes recibir un [aviso "
+"DMCA](https://www.dmca.com/Solutions/view.aspx?ID=712f28a5-93f2-467b-"
+"ba92-3d58c8345a32&?ref=sol08a2)."
#: https//community.torproject.org/relay/types-of-relays/
#: (content/relay-operations/types-of-relays/contents+en.lrpage.body)
commit 2da7b6665e878a50298db59d08a768c3b286e466
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 13:15:26 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=communitytpo-conten…
---
contents+es.po | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/contents+es.po b/contents+es.po
index b5dc41fb5b..42d19d8067 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -758,7 +758,7 @@ msgstr "# CPU"
#: https//community.torproject.org/relay/relays-requirements/
#: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
msgid "* Any modern CPU should be fine."
-msgstr ""
+msgstr "Cualquier CPU moderna debería bastar."
#: https//community.torproject.org/relay/relays-requirements/
#: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -767,6 +767,9 @@ msgid ""
"performance and allow for up to about ~400-450 Mbps in each direction on a "
"single tor instance on modern CPUs)."
msgstr ""
+"* Se recomienda usar CPUs con soporte para AESNI (esto mejorará el "
+"rendimiento y permitirá mover unos 400-450 Mbps en cada sentido en cada "
+"instancia tor en CPUs modernas)."
#: https//community.torproject.org/relay/relays-requirements/
#: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -774,6 +777,8 @@ msgid ""
"If the file /proc/cpuinfo contains the word aes your CPU has support for "
"AES-NI."
msgstr ""
+"Si el archivo /proc/cpuinfo contiene la palabra aes, tu CPU tiene soporte "
+"para AES-NI."
#: https//community.torproject.org/relay/relays-requirements/
#: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
@@ -791,11 +796,14 @@ msgstr ""
#: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
msgid "Ideally the relay runs on a server which runs 24/7."
msgstr ""
+"Lo ideal es que el repetidor funcione en un servidor que está en marcha en "
+"régimen 24/7."
#: https//community.torproject.org/relay/relays-requirements/
#: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
msgid "Reboots and tor daemon restarts are fine."
msgstr ""
+"Los reinicios del servidor o del proceso tor no suponen ningún problema."
#: https//community.torproject.org/relay/relays-requirements/
#: (content/relay-operations/relays-requirements/contents+en.lrpage.body)
commit 93e8337554ea866802093f93678a5d0060582f9e
Author: Translation commit bot <translation(a)torproject.org>
Date: Fri Feb 28 12:52:55 2020 +0000
https://gitweb.torproject.org/translation.git/commit/?h=tpo-web
---
contents+es.po | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/contents+es.po b/contents+es.po
index ceac3063c6..5c32a175ac 100644
--- a/contents+es.po
+++ b/contents+es.po
@@ -1268,7 +1268,7 @@ msgstr "Echa un vistazo al %s para más información."
#: templates/download.html:49
msgid "How can I verify Tor Browser signature?"
-msgstr "¿Cómo puedo verificar la firma del Tor Browser?"
+msgstr "¿Cómo puedo verificar la firma del Navegador Tor?"
#: templates/download.html:54
msgid "Stand up for privacy and freedom online."