fixing conflict

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 ""

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 ""

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 ""