summaryrefslogtreecommitdiffstats
path: root/wiki
diff options
context:
space:
mode:
authorIkiWiki <ikiwiki.info>2019-06-10 15:18:42 +0000
committerIkiWiki <ikiwiki.info>2019-06-10 15:18:42 +0000
commitf41b737feeae22fd7b760abc9965644549018d8d (patch)
treea5ba42f9d3cc877765d2f6bb32ae236745dd654e /wiki
parent225f95c15df0ea253ba9837471a54b72fe380cd0 (diff)
parent9a758d88b0d0d967a866588d8a1d349e315aa401 (diff)
fixing conflict
Diffstat (limited to 'wiki')
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.de.po6
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.es.po9
-rw-r--r--wiki/src/doc/anonymous_internet/tor_status.fr.po6
3 files changed, 11 insertions, 10 deletions
diff --git a/wiki/src/doc/anonymous_internet/tor_status.de.po b/wiki/src/doc/anonymous_internet/tor_status.de.po
index 34ea425..f116a52 100644
--- a/wiki/src/doc/anonymous_internet/tor_status.de.po
+++ b/wiki/src/doc/anonymous_internet/tor_status.de.po
@@ -184,9 +184,9 @@ msgid ""
msgstr ""
"In dem Beispiel oben geht die Verbindung zu\n"
"<span class=\"code\">check.torproject.org</span> über die Relais\n"
-"<span class=\"guilabel\">Unnamed</span>,\n"
-"<span class=\"guilabel\">betGamersTorRelay</span> und das Ausgansrelais\n"
-"<span class=\"guilabel\">hessel0</span>.\n"
+"<span class=\"guilabel\">tor7kryptonit</span>,\n"
+"<span class=\"guilabel\">Casper03</span> und das Ausgansrelais\n"
+"<span class=\"guilabel\">blackfish</span>.\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/anonymous_internet/tor_status.es.po b/wiki/src/doc/anonymous_internet/tor_status.es.po
index 6d5703c..1cd1de7 100644
--- a/wiki/src/doc/anonymous_internet/tor_status.es.po
+++ b/wiki/src/doc/anonymous_internet/tor_status.es.po
@@ -182,10 +182,11 @@ msgid ""
"<span class=\"guilabel\">blackfish</span>.\n"
msgstr ""
"En el ejemplo de abajo, la conexión a\n"
-"<span class=\"code\">check.torproject.org</span> pasa a través de los repetidores\n"
-"<span class=\"guilabel\">Unnamed</span>,\n"
-"<span class=\"guilabel\">betGamersTorRelay</span>, y el nodo de salida\n"
-"<span class=\"guilabel\">hessel0</span>.\n"
+"<span class=\"code\">check.torproject.org</span> pasa a través de los "
+"repetidores\n"
+"<span class=\"guilabel\">tor7kryptonit</span>,\n"
+"<span class=\"guilabel\">Casper03</span>, y el nodo de salida\n"
+"<span class=\"guilabel\">blackfish</span>.\n"
#. type: Plain text
msgid ""
diff --git a/wiki/src/doc/anonymous_internet/tor_status.fr.po b/wiki/src/doc/anonymous_internet/tor_status.fr.po
index bf1b038..3d55b13 100644
--- a/wiki/src/doc/anonymous_internet/tor_status.fr.po
+++ b/wiki/src/doc/anonymous_internet/tor_status.fr.po
@@ -183,9 +183,9 @@ msgid ""
msgstr ""
"Dans l'exemple ci-dessous, la connexion vers\n"
"<span class=\"code\">check.torproject.org</span> passe par les relais\n"
-"<span class=\"guilabel\">Unnamed</span>,\n"
-"<span class=\"guilabel\">betGamersTorRelay</span>, et le nœud de sortie\n"
-"<span class=\"guilabel\">hessel0</span>.\n"
+"<span class=\"guilabel\">tor7kryptonit</span>,\n"
+"<span class=\"guilabel\">Casper03</span>, et le nœud de sortie\n"
+"<span class=\"guilabel\">blackfish</span>.\n"
#. type: Plain text
msgid ""