commit 41c7671ec0bd10e769d559c932d5cedebf080440
Author: Karsten Loesing <karsten.loes...@gmx.net>
Date: Mon May 13 15:18:53 2019 +0200
Adapt "About Tor" links to redesigned Tor website.
Reported by nusenu, changes suggested by irl.
Fixes #30415.
---
CHANGELOG.md | 7 +++++++
.../torproject/metrics/exonerator/ExoneraTorServlet.java | 15 ++++++---------
src/main/resources/ExoneraTor.properties | 7 +++----
src/main/resources/ExoneraTor_de.properties | 7 +++----
src/main/resources/ExoneraTor_fr.properties | 7 +++----
src/main/resources/ExoneraTor_ro.properties | 7 +++----
src/main/resources/ExoneraTor_sv.properties | 7 +++----
7 files changed, 28 insertions(+), 29 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a628fa..4b2646d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+# Changes in version 4.1.0 - 2019-05-??
+
+ * Minor changes
+ - Remove first link under "About Tor" and change second and third
+ link to adapt to redesigned Tor website.
+
+
# Changes in version 4.0.0 - 2018-08-14
* Major changes
diff --git
a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
index 5909f26..a74aa60 100644
--- a/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
+++ b/src/main/java/org/torproject/metrics/exonerator/ExoneraTorServlet.java
@@ -373,7 +373,7 @@ public class ExoneraTorServlet extends HttpServlet {
private void writeSummaryUnableToConnectToBackend(PrintWriter out,
ResourceBundle rb) {
String contactLink =
- "<a href=\"https://www.torproject.org/about/contact\";>"
+ "<a href=\"https://www.torproject.org/contact\";>"
+ rb.getString("summary.serverproblem.dbempty.body.link")
+ "</a>";
this.writeSummary(out, rb.getString("summary.heading"),
@@ -385,7 +385,7 @@ public class ExoneraTorServlet extends HttpServlet {
private void writeSummaryNoData(PrintWriter out, ResourceBundle rb) {
String contactLink =
- "<a href=\"https://www.torproject.org/about/contact\";>"
+ "<a href=\"https://www.torproject.org/contact\";>"
+ rb.getString("summary.serverproblem.dbempty.body.link")
+ "</a>";
this.writeSummary(out, rb.getString("summary.heading"),
@@ -453,7 +453,7 @@ public class ExoneraTorServlet extends HttpServlet {
private void writeSummaryNoDataForThisInterval(PrintWriter out,
ResourceBundle rb) {
String contactLink =
- "<a href=\"https://www.torproject.org/about/contact\";>"
+ "<a href=\"https://www.torproject.org/contact\";>"
+ rb.getString("summary.serverproblem.dbempty.body.link")
+ "</a>";
this.writeSummary(out, rb.getString("summary.heading"),
@@ -625,13 +625,10 @@ public class ExoneraTorServlet extends HttpServlet {
+ " </div><!-- col -->\n",
rb.getString("footer.abouttor.heading"),
String.format(rb.getString("footer.abouttor.body.text"),
- "<a href=\"https://www.torproject.org/about/";
- + "overview#thesolution\">"
+ "<a href=\"https://www.torproject.org/about\";>"
+ rb.getString("footer.abouttor.body.link1") + "</a>",
- "<a href=\"https://www.torproject.org/about/overview\";>"
- + rb.getString("footer.abouttor.body.link2") + "</a>",
- "<a href=\"https://www.torproject.org/about/contact\";>"
- + rb.getString("footer.abouttor.body.link3") + "</a>"));
+ "<a href=\"https://www.torproject.org/contact\";>"
+ + rb.getString("footer.abouttor.body.link2") + "</a>"));
out.printf(" <div class=\"col-xs-6\">\n"
+ " <h3>%s</h3>\n"
+ " <p class=\"small\">%s</p>\n"
diff --git a/src/main/resources/ExoneraTor.properties
b/src/main/resources/ExoneraTor.properties
index 936754a..05bb0cb 100644
--- a/src/main/resources/ExoneraTor.properties
+++ b/src/main/resources/ExoneraTor.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Yes
technicaldetails.exit.no=No
permanentlink.heading=Permanent link
footer.abouttor.heading=About Tor
-footer.abouttor.body.text=Tor is an international software project to
anonymize Internet traffic by %s. Therefore, if you see traffic from a
Tor relay, this traffic usually originates from someone using Tor, rather than
from the relay operator. The Tor Project and Tor relay operators have no
records of the traffic that passes over the network and therefore cannot
provide any information about its origin. Be sure to %s, and don't
hesitate to %s for more information.
-footer.abouttor.body.link1=encrypting packets and sending them through a
series of hops before they reach their destination
-footer.abouttor.body.link2=learn more about Tor
-footer.abouttor.body.link3=contact The Tor Project, Inc.
+footer.abouttor.body.text=Tor is an international software project to
anonymize Internet traffic by encrypting packets and sending them through a
series of hops before they reach their destination. Therefore, if you see
traffic from a Tor relay, this traffic usually originates from someone using
Tor, rather than from the relay operator. The Tor Project and Tor relay
operators have no records of the traffic that passes over the network and
therefore cannot provide any information about its origin. Be sure to %s,
and don't hesitate to %s for more information.
+footer.abouttor.body.link1=learn more about Tor
+footer.abouttor.body.link2=contact The Tor Project, Inc.
footer.aboutexonerator.heading=About ExoneraTor
footer.aboutexonerator.body=The ExoneraTor service maintains a database of IP
addresses that have been part of the Tor network. It answers the question
whether there was a Tor relay running on a given IP address on a given
date. ExoneraTor may store more than one IP address per relay if relays
use a different IP address for exiting to the Internet than for registering in
the Tor network, and it stores whether a relay permitted transit of Tor traffic
to the open Internet at that time.
footer.language.name=English
diff --git a/src/main/resources/ExoneraTor_de.properties
b/src/main/resources/ExoneraTor_de.properties
index fbe8464..13b150b 100644
--- a/src/main/resources/ExoneraTor_de.properties
+++ b/src/main/resources/ExoneraTor_de.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Ja
technicaldetails.exit.no=Nein
permanentlink.heading=Dauerhafter Link
footer.abouttor.heading=\u00dcber Tor
-footer.abouttor.body.text=Tor ist ein internationales Softwareprojekt um
Internetverbindungen zu anonymisieren indem %s. Wenn Sie eine
Internetverbindung sehen, die von einem Tor-Server kommt, stammt diese in der
Regel von jemandem, der Tor benutzt, und nicht vom Betreiber des Tor-Servers
selbst. Weder The Tor Project, Inc. noch die Tor-Server-Betreiber besitzen
Aufzeichnungen \u00fcber die Internetverbindungen im Tor-Netzwerk und
k\u00f6nnen daher keine Auskunft \u00fcber den Ursprung der Internetverbindung
geben. Mehr Informationen \u00fcber Tor erhalten Sie %s. The Tor Project, Inc.
steht Ihnen jederzeit f\u00fcr %s zur Verf\u00fcgung.
-footer.abouttor.body.link1=Datenpakete verschl\u00fcsselt und \u00fcber eine
Reihe von Stationen geleitet werden bevor diese ihr Ziel erreichen
-footer.abouttor.body.link2=hier
-footer.abouttor.body.link3=Fragen
+footer.abouttor.body.text=Tor ist ein internationales Softwareprojekt um
Internetverbindungen zu anonymisieren indem Datenpakete verschl\u00fcsselt und
\u00fcber eine Reihe von Stationen geleitet werden bevor diese ihr Ziel
erreichen. Wenn Sie eine Internetverbindung sehen, die von einem Tor-Server
kommt, stammt diese in der Regel von jemandem, der Tor benutzt, und nicht vom
Betreiber des Tor-Servers selbst. Weder The Tor Project, Inc. noch die
Tor-Server-Betreiber besitzen Aufzeichnungen \u00fcber die Internetverbindungen
im Tor-Netzwerk und k\u00f6nnen daher keine Auskunft \u00fcber den Ursprung der
Internetverbindung geben. Mehr Informationen \u00fcber Tor erhalten Sie %s. The
Tor Project, Inc. steht Ihnen jederzeit f\u00fcr %s zur Verf\u00fcgung.
+footer.abouttor.body.link1=hier
+footer.abouttor.body.link2=Fragen
footer.aboutexonerator.heading=\u00dcber ExoneraTor
footer.aboutexonerator.body=Der ExoneraTor-Dienst basiert auf einer Datenbank
von IP-Adressen, die Teil des Tor-Netzwerks sind oder waren. Dieser Dienst
beantwortet die Frage, ob es an einem bestimmten Tag einen Tor-Server mit einer
bestimmten IP-Adresse gegeben hat. ExoneraTor kann in einigen F\u00e4llen mehr
als nur eine IP-Adresse pro Tor-Server speichern, falls ein Tor-Server eine
andere IP-Adresse f\u00fcr ausgehende Verbindungen verwendet hat als die
IP-Adresse um sich im Tor-Netzwerk zu registrieren. ExoneraTor speichert
au\u00dferdem ob ein Tor-Server Verbindungen ins offene Internet zugelassen hat
oder nicht.
footer.language.name=Deutsch
diff --git a/src/main/resources/ExoneraTor_fr.properties
b/src/main/resources/ExoneraTor_fr.properties
index 93c33bb..3aaf3e5 100644
--- a/src/main/resources/ExoneraTor_fr.properties
+++ b/src/main/resources/ExoneraTor_fr.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Oui
technicaldetails.exit.no=Non
permanentlink.heading=Lien permanent
footer.abouttor.heading=\u00c0 propos de Tor
-footer.abouttor.body.text=Tor est un projet international d\u00e9veloppant des
logiciels pour anonymiser le trafic Internet en %s. Par cons\u00e9quent, si
vous voyez du trafic en provenance d'un relais Tor, ce trafic provient
habituellement de quelqu'un qui utilise Tor, plut\u00f4t que de
l'op\u00e9rateur du relais. Le Projet Tor et les op\u00e9rateurs de relais Tor
n'ont aucune trace du trafic relay\u00e9 par le r\u00e9seau et ne peuvent donc
fournir aucune information sur son origine. N'h\u00e9sitez pas \u00e0 vous %s
et n'h\u00e9sitez pas \u00e0 %s pour obtenir d'avantage d'informations.
-footer.abouttor.body.link1=chiffrant les paquets et en les faisant transiter
par une s\u00e9rie de relais avant qu'ils n'atteignent leur destination
-footer.abouttor.body.link2=renseigner d'avantage au sujet de Tor
-footer.abouttor.body.link3=contacter \u00ab The Tor Project, Inc. \u00bb
+footer.abouttor.body.text=Tor est un projet international d\u00e9veloppant des
logiciels pour anonymiser le trafic Internet en chiffrant les paquets et en les
faisant transiter par une s\u00e9rie de relais avant qu'ils n'atteignent leur
destination. Par cons\u00e9quent, si vous voyez du trafic en provenance d'un
relais Tor, ce trafic provient habituellement de quelqu'un qui utilise Tor,
plut\u00f4t que de l'op\u00e9rateur du relais. Le Projet Tor et les
op\u00e9rateurs de relais Tor n'ont aucune trace du trafic relay\u00e9 par le
r\u00e9seau et ne peuvent donc fournir aucune information sur son origine.
N'h\u00e9sitez pas \u00e0 vous %s et n'h\u00e9sitez pas \u00e0 %s pour obtenir
d'avantage d'informations.
+footer.abouttor.body.link1=renseigner d'avantage au sujet de Tor
+footer.abouttor.body.link2=contacter \u00ab The Tor Project, Inc. \u00bb
footer.aboutexonerator.heading=\u00c0 propos d'ExoneraTor
footer.aboutexonerator.body=Le service ExoneraTor g\u00e8re une base de
donn\u00e9es d'adresses IP qui ont fait partie du r\u00e9seau Tor. Il permet de
savoir si un relais Tor fonctionnait pour une adresse IP donn\u00e9e \u00e0 une
date pr\u00e9cise. ExoneraTor peut enregistrer plus d'une adresse IP par relais
si ces derniers utilisent une adresse IP diff\u00e9rente pour se connecter
\u00e0 Internet de celle utilis\u00e9e pour s'enregistrer sur le r\u00e9seau
Tor. ExoneraTor enregistre \u00e9galement les dates et heures auxquelles un
relais a permis de faire transiter du trafic en provenance de Tor vers Internet.
footer.language.name=fran\u00e7ais
diff --git a/src/main/resources/ExoneraTor_ro.properties
b/src/main/resources/ExoneraTor_ro.properties
index 3d58072..476f020 100644
--- a/src/main/resources/ExoneraTor_ro.properties
+++ b/src/main/resources/ExoneraTor_ro.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Da
technicaldetails.exit.no=Nu
permanentlink.heading=Link permanent
footer.abouttor.heading=Despre Tor
-footer.abouttor.body.text=Tor este un proiect software interna\u021bional
pentru anonimizarea traficului de internet prin %s. De aceea, dac\u0103
vede\u021bi trafic de la un nod Tor, acest trafic provine mai degrab\u0103 de
la un client care folose\u0219te Tor, nu de la operatorul releului. The
Tor Project, Inc. (organiza\u021bia) \u0219i operatorii nodurilor Tor nu
de\u021bin informa\u021bii referitoare la traficul care trece prin re\u021bea
\u0219i, implicit, prin nodurile operate de ace\u0219tia, de aceea nu pot
furniza informa\u021bii despre originea acestuia. Asigura\u021bi-v\u0103
c\u0103 %s \u0219i nu ezita\u021bi s\u0103 %s pentru mai multe informa\u021bii.
-footer.abouttor.body.link1=criptarea pachetelor de date \u0219i transmiterea
acestora printr-o serie de hop-uri \u00eenainte ca ele s\u0103 ajung\u0103 la
destina\u021bie
-footer.abouttor.body.link2=Afla\u021bi mai multe despre Tor
-footer.abouttor.body.link3=contacta\u021bi The Tor Project, Inc.
+footer.abouttor.body.text=Tor este un proiect software interna\u021bional
pentru anonimizarea traficului de internet prin criptarea pachetelor de date
\u0219i transmiterea acestora printr-o serie de hop-uri \u00eenainte ca ele
s\u0103 ajung\u0103 la destina\u021bie. De aceea, dac\u0103 vede\u021bi
trafic de la un nod Tor, acest trafic provine mai degrab\u0103 de la un client
care folose\u0219te Tor, nu de la operatorul releului. The Tor Project,
Inc. (organiza\u021bia) \u0219i operatorii nodurilor Tor nu de\u021bin
informa\u021bii referitoare la traficul care trece prin re\u021bea \u0219i,
implicit, prin nodurile operate de ace\u0219tia, de aceea nu pot furniza
informa\u021bii despre originea acestuia. Asigura\u021bi-v\u0103 c\u0103 %s
\u0219i nu ezita\u021bi s\u0103 %s pentru mai multe informa\u021bii.
+footer.abouttor.body.link1=Afla\u021bi mai multe despre Tor
+footer.abouttor.body.link2=contacta\u021bi The Tor Project, Inc.
footer.aboutexonerator.heading=Despre ExoneraTor
footer.aboutexonerator.body=Serviciul ExoneraTor opereaz\u0103 o baz\u0103 de
date de adrese IP care au fost parte din re\u021belaua Tor la un anumit
moment. Acest serviciu r\u0103spunde la \u00eentrebarea dac\u0103 a
existat un nod Tor care a func\u021bionat pe o anumit\u0103 adres\u0103 IP la o
anumit\u0103 dat\u0103. ExoneraTor poate stoca mai mult de o adresa IP
per nod dac\u0103 nodurile folosesc o alt\u0103 adres\u0103 IP pentru a
ie\u0219i pe internet dec\u00e2t cea folosit\u0103 pentru \u00eenregistrarea
\u00een re\u021beaua Tor \u0219i stocheaz\u0103 dac\u0103 un nod a permis
tranzitarea de trafic din re\u021beaua Tor catre internetul public la acea
dat\u0103.
footer.language.name=rom\u00e2n\u0103
diff --git a/src/main/resources/ExoneraTor_sv.properties
b/src/main/resources/ExoneraTor_sv.properties
index 8e649bd..53427b6 100644
--- a/src/main/resources/ExoneraTor_sv.properties
+++ b/src/main/resources/ExoneraTor_sv.properties
@@ -43,10 +43,9 @@ technicaldetails.exit.yes=Ja
technicaldetails.exit.no=Nej
permanentlink.heading=Permanent l\u00e4nk
footer.abouttor.heading=Om Tor
-footer.abouttor.body.text=Tor \u00e4r ett internationellt mjukvaruprojekt
f\u00f6r att anonymisera internettrafik genom att %s. Om du ser trafik
fr\u00e5n ett Tor-rel\u00e4 s\u00e5 kommer den trafiken oftast fr\u00e5n
n\u00e5gon som anv\u00e4nder sig av Tor snarare \u00e4n fr\u00e5n sj\u00e4lva
rel\u00e4operat\u00f6ren. Vare sig Tor-projektet eller
Tor-rel\u00e4operat\u00f6rer har n\u00e5gon historik \u00f6ver trafiken som
passerar genom n\u00e4tverket och kan d\u00e4rf\u00f6r inte ge n\u00e5gon
information om dess ursprung. Se till att %s och tveka inte att %s f\u00f6r
ytterligare information.
-footer.abouttor.body.link1=kryptera datat och skicka det genom flera hopp
innan det n\u00e5r sin destination
-footer.abouttor.body.link2=l\u00e4sa p\u00e5 om Tor
-footer.abouttor.body.link3=kontakta Tor-projektet
+footer.abouttor.body.text=Tor \u00e4r ett internationellt mjukvaruprojekt
f\u00f6r att anonymisera internettrafik genom att kryptera datat och skicka det
genom flera hopp innan det n\u00e5r sin destination. Om du ser trafik fr\u00e5n
ett Tor-rel\u00e4 s\u00e5 kommer den trafiken oftast fr\u00e5n n\u00e5gon som
anv\u00e4nder sig av Tor snarare \u00e4n fr\u00e5n sj\u00e4lva
rel\u00e4operat\u00f6ren. Vare sig Tor-projektet eller
Tor-rel\u00e4operat\u00f6rer har n\u00e5gon historik \u00f6ver trafiken som
passerar genom n\u00e4tverket och kan d\u00e4rf\u00f6r inte ge n\u00e5gon
information om dess ursprung. Se till att %s och tveka inte att %s f\u00f6r
ytterligare information.
+footer.abouttor.body.link1=l\u00e4sa p\u00e5 om Tor
+footer.abouttor.body.link2=kontakta Tor-projektet
footer.aboutexonerator.heading=Om ExoneraTor
footer.aboutexonerator.body=Tj\u00e4nsten ExoneraTor uppr\u00e4tth\u00e5ller
en databas \u00f6ver IP-adresser som har varit en del av Tor-n\u00e4tverket.
Den ger svar p\u00e5 fr\u00e5gan om det var ett Tor-rel\u00e4 som anv\u00e4nde
en viss IP-adress vid ett givet datum. ExoneraTor kan komma att lagra fler
\u00e4n en IP-adress per rel\u00e4 f\u00f6r rel\u00e4n som anv\u00e4nder en
annan IP-adress f\u00f6r att ansluta till internet \u00e4n den som
anv\u00e4ndes f\u00f6r att registrera sig i Tor-n\u00e4tverket. Huruvida ett
rel\u00e4 har till\u00e5tit Tor-trafik ut mot internet vid tidpunkten eller ej
lagras ocks\u00e5.
footer.language.name=svenska
_______________________________________________
tor-commits mailing list
tor-commits@lists.torproject.org
https://lists.torproject.org/cgi-bin/mailman/listinfo/tor-commits
