- tor-commits - lists.torproject.org

[tor/master] Merge remote-tracking branch 'public/bug3963' into maint-0.2.2
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit b3c988f0d7e18c243074e3e583c10b204521088f Merge: fbcd7c0 45eadf3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 10:52:15 2011 -0500 Merge remote-tracking branch 'public/bug3963' into maint-0.2.2 changes/bug3963 | 5 +++++ src/or/ntmain.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/maint-0.2.2] All NT service configuration commands should make the process exit.
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit 45eadf39551bc1d3d00e677c8b7fd977a17aad01 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Sep 8 21:54:12 2011 -0400 All NT service configuration commands should make the process exit. Fixes bug 3963; fix on 0.2.0.7-alpha. --- changes/bug3963 | 5 +++++ src/or/ntmain.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug3963 b/changes/bug3963 new file mode 100644 index 0000000..2fc44a0 --- /dev/null +++ b/changes/bug3963 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - When configuring, starting, or stopping an NT service, stop + immediately after the service configuration attempt has succeeded + or failed. Fixes bug3963; bugfix on 0.2.0.7-alpha. + diff --git a/src/or/ntmain.c b/src/or/ntmain.c index b2fee64..985fab7 100644 --- a/src/or/ntmain.c +++ b/src/or/ntmain.c @@ -728,6 +728,7 @@ nt_service_parse_options(int argc, char **argv, int *should_exit) if ((argc >= 3) && (!strcmp(argv[1], "-service") || !strcmp(argv[1], "--service"))) { nt_service_loadlibrary(); + *should_exit = 1; if (!strcmp(argv[2], "install")) return nt_service_install(argc, argv); if (!strcmp(argv[2], "remove")) @@ -737,7 +738,6 @@ nt_service_parse_options(int argc, char **argv, int *should_exit) if (!strcmp(argv[2], "stop")) return nt_service_cmd_stop(); printf("Unrecognized service command '%s'\n", argv[2]); - *should_exit = 1; return 1; } if (argc >= 2) {

1 0

[tor/maint-0.2.2] Merge remote-tracking branch 'public/bug3963' into maint-0.2.2
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit b3c988f0d7e18c243074e3e583c10b204521088f Merge: fbcd7c0 45eadf3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 10:52:15 2011 -0500 Merge remote-tracking branch 'public/bug3963' into maint-0.2.2 changes/bug3963 | 5 +++++ src/or/ntmain.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/master] Changes file for bug4360
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit a6eef61f02deb123d44a58dac2e506650826db48 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 10:47:57 2011 -0500 Changes file for bug4360 --- changes/bug4360 | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/changes/bug4360 b/changes/bug4360 new file mode 100644 index 0000000..93afa82 --- /dev/null +++ b/changes/bug4360 @@ -0,0 +1,3 @@ + o Code simplification and refactoring: + - Use the name "CERTS" consistently to refer to the new cell type; + we were calling it CERT in some places and CERTS in others.

1 0

[tor/master] normalize the name of the CERTS cell
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit be1f3a5eb596730cbb321c525a92ceb0a8178128 Author: Roger Dingledine <arma(a)torproject.org> Date: Mon Oct 31 04:33:38 2011 -0400 normalize the name of the CERTS cell --- src/or/command.c | 48 ++++++++++++++++++++++++------------------------ src/or/connection_or.c | 8 ++++---- src/or/connection_or.h | 2 +- src/or/or.h | 12 ++++++------ 4 files changed, 35 insertions(+), 35 deletions(-) diff --git a/src/or/command.c b/src/or/command.c index c02d353..e68b6bf 100644 --- a/src/or/command.c +++ b/src/or/command.c @@ -49,7 +49,7 @@ uint64_t stats_n_netinfo_cells_processed = 0; /** How many CELL_VPADDING cells have we received, ever? */ uint64_t stats_n_vpadding_cells_processed = 0; /** How many CELL_CERTS cells have we received, ever? */ -uint64_t stats_n_cert_cells_processed = 0; +uint64_t stats_n_certs_cells_processed = 0; /** How many CELL_AUTH_CHALLENGE cells have we received, ever? */ uint64_t stats_n_auth_challenge_cells_processed = 0; /** How many CELL_AUTHENTICATE cells have we received, ever? */ @@ -63,7 +63,7 @@ static void command_process_destroy_cell(cell_t *cell, or_connection_t *conn); static void command_process_versions_cell(var_cell_t *cell, or_connection_t *conn); static void command_process_netinfo_cell(cell_t *cell, or_connection_t *conn); -static void command_process_cert_cell(var_cell_t *cell, +static void command_process_certs_cell(var_cell_t *cell, or_connection_t *conn); static void command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn); @@ -214,19 +214,19 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) #ifdef KEEP_TIMING_STATS /* how many of each cell have we seen so far this second? needs better * name. */ - static int num_versions=0, num_cert=0; + static int num_versions=0, num_certs=0; time_t now = time(NULL); if (now > current_second) { /* the second has rolled over */ /* print stats */ log_info(LD_OR, - "At end of second: %d versions (%d ms), %d cert (%d ms)", + "At end of second: %d versions (%d ms), %d certs (%d ms)", num_versions, versions_time/1000, - cert, cert_time/1000); + num_certs, certs_time/1000); - num_versions = num_cert = 0; - versions_time = cert_time = 0; + num_versions = num_certs = 0; + versions_time = certs_time = 0; /* remember which second it is, for next time */ current_second = now; @@ -293,9 +293,9 @@ command_process_var_cell(var_cell_t *cell, or_connection_t *conn) ++stats_n_vpadding_cells_processed; /* Do nothing */ break; - case CELL_CERT: - ++stats_n_cert_cells_processed; - PROCESS_CELL(cert, cell, conn); + case CELL_CERTS: + ++stats_n_certs_cells_processed; + PROCESS_CELL(certs, cell, conn); break; case CELL_AUTH_CHALLENGE: ++stats_n_auth_challenge_cells_processed; @@ -719,8 +719,8 @@ command_process_versions_cell(var_cell_t *cell, or_connection_t *conn) } } if (send_certs) { - if (connection_or_send_cert_cell(conn) < 0) { - log_warn(LD_OR, "Couldn't send cert cell"); + if (connection_or_send_certs_cell(conn) < 0) { + log_warn(LD_OR, "Couldn't send certs cell"); connection_mark_for_close(TO_CONN(conn)); return; } @@ -887,9 +887,9 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) assert_connection_ok(TO_CONN(conn),time(NULL)); } -/** Process a CERT cell from an OR connection. +/** Process a CERTS cell from an OR connection. * - * If the other side should not have sent us a CERT cell, or the cell is + * If the other side should not have sent us a CERTS cell, or the cell is * malformed, or it is supposed to authenticate the TLS key but it doesn't, * then mark the connection. * @@ -899,12 +899,12 @@ command_process_netinfo_cell(cell_t *cell, or_connection_t *conn) * If it's the server side, wait for an AUTHENTICATE cell. */ static void -command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) +command_process_certs_cell(var_cell_t *cell, or_connection_t *conn) { #define ERR(s) \ do { \ log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, \ - "Received a bad CERT cell from %s:%d: %s", \ + "Received a bad CERTS cell from %s:%d: %s", \ safe_str(conn->_base.address), conn->_base.port, (s)); \ connection_mark_for_close(TO_CONN(conn)); \ goto err; \ @@ -921,7 +921,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) ERR("We're not doing a v3 handshake!"); if (conn->link_proto < 3) ERR("We're not using link protocol >= 3"); - if (conn->handshake_state->received_cert_cell) + if (conn->handshake_state->received_certs_cell) ERR("We already got one"); if (conn->handshake_state->authenticated) { /* Should be unreachable, but let's make sure. */ @@ -951,7 +951,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) tor_cert_t *cert = tor_cert_decode(ptr + 3, cert_len); if (!cert) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL, - "Received undecodable certificate in CERT cell from %s:%d", + "Received undecodable certificate in CERTS cell from %s:%d", safe_str(conn->_base.address), conn->_base.port); } else { if (cert_type == OR_CERT_TYPE_TLS_LINK) { @@ -1041,7 +1041,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) id_cert = auth_cert = NULL; } - conn->handshake_state->received_cert_cell = 1; + conn->handshake_state->received_certs_cell = 1; err: tor_cert_free(id_cert); tor_cert_free(link_cert); @@ -1055,7 +1055,7 @@ command_process_cert_cell(var_cell_t *cell, or_connection_t *conn) * originator of the connection), or it's ill-formed, or we aren't doing a v3 * handshake, mark the connection. If the cell is well-formed but we don't * want to authenticate, just drop it. If the cell is well-formed *and* we - * want to authenticate, send an AUTHENTICATE cell. */ + * want to authenticate, send an AUTHENTICATE cell and then a NETINFO cell. */ static void command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn) { @@ -1079,7 +1079,7 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn) ERR("We didn't originate this connection"); if (conn->handshake_state->received_auth_challenge) ERR("We already received one"); - if (! conn->handshake_state->received_cert_cell) + if (! conn->handshake_state->received_certs_cell) ERR("We haven't gotten a CERTS cell yet"); if (cell->payload_len < OR_AUTH_CHALLENGE_LEN + 2) ERR("It was too short"); @@ -1128,7 +1128,7 @@ command_process_auth_challenge_cell(var_cell_t *cell, or_connection_t *conn) * If it's ill-formed or we weren't supposed to get one or we're not doing a * v3 handshake, then mark the connection. If it does not authenticate the * other side of the connection successfully (because it isn't signed right, - * we didn't get a CERT cell, etc) mark the connection. Otherwise, accept + * we didn't get a CERTS cell, etc) mark the connection. Otherwise, accept * the identity of the router on the other side of the connection. */ static void @@ -1159,8 +1159,8 @@ command_process_authenticate_cell(var_cell_t *cell, or_connection_t *conn) /* Should be impossible given other checks */ ERR("The peer is already authenticated"); } - if (! conn->handshake_state->received_cert_cell) - ERR("We never got a cert cell"); + if (! conn->handshake_state->received_certs_cell) + ERR("We never got a certs cell"); if (conn->handshake_state->auth_cert == NULL) ERR("We never got an authentication certificate"); if (conn->handshake_state->id_cert == NULL) diff --git a/src/or/connection_or.c b/src/or/connection_or.c index 202548a..684d3ab 100644 --- a/src/or/connection_or.c +++ b/src/or/connection_or.c @@ -1435,7 +1435,7 @@ connection_or_check_valid_tls_handshake(or_connection_t *conn, * side of conn is peer_id. For v1 and v2 handshakes, * this is right after we get a certificate chain in a TLS handshake * or renegotiation. For v3 handshakes, this is right after we get a - * certificate chain in a CERT cell. + * certificate chain in a CERTS cell. * * If we want any particular ID before, record the one we got. * @@ -1950,10 +1950,10 @@ connection_or_send_netinfo(or_connection_t *conn) return 0; } -/** Send a CERT cell on the connection conn. Return 0 on success, -1 +/** Send a CERTS cell on the connection conn. Return 0 on success, -1 * on failure. */ int -connection_or_send_cert_cell(or_connection_t *conn) +connection_or_send_certs_cell(or_connection_t *conn) { const tor_cert_t *link_cert = NULL, *id_cert = NULL; const uint8_t *link_encoded = NULL, *id_encoded = NULL; @@ -1977,7 +1977,7 @@ connection_or_send_cert_cell(or_connection_t *conn) 2 * ( 1 + 2 ) /* For each cert: 1 byte for type, 2 for length */ + link_len + id_len; cell = var_cell_new(cell_len); - cell->command = CELL_CERT; + cell->command = CELL_CERTS; cell->payload[0] = 2; pos = 1; diff --git a/src/or/connection_or.h b/src/or/connection_or.h index df009ab..62a15b1 100644 --- a/src/or/connection_or.h +++ b/src/or/connection_or.h @@ -69,7 +69,7 @@ int connection_or_send_destroy(circid_t circ_id, or_connection_t *conn, int reason); int connection_or_send_versions(or_connection_t *conn, int v3_plus); int connection_or_send_netinfo(or_connection_t *conn); -int connection_or_send_cert_cell(or_connection_t *conn); +int connection_or_send_certs_cell(or_connection_t *conn); int connection_or_send_auth_challenge_cell(or_connection_t *conn); int connection_or_compute_authenticate_cell_body(or_connection_t *conn, uint8_t *out, size_t outlen, diff --git a/src/or/or.h b/src/or/or.h index e4f9b9b..259ae5c 100644 --- a/src/or/or.h +++ b/src/or/or.h @@ -826,7 +826,7 @@ typedef enum { #define CELL_RELAY_EARLY 9 #define CELL_VPADDING 128 -#define CELL_CERT 129 +#define CELL_CERTS 129 #define CELL_AUTH_CHALLENGE 130 #define CELL_AUTHENTICATE 131 @@ -1088,10 +1088,10 @@ typedef struct listener_connection_t { #define OR_AUTH_CHALLENGE_LEN 32 /** - * @name Certificate types for CERT cells. + * @name Certificate types for CERTS cells. * * These values are defined by the protocol, and affect how an X509 - * certificate in a CERT cell is interpreted and used. + * certificate in a CERTS cell is interpreted and used. * * @{ */ /** A certificate that authenticates a TLS link key. The subject key @@ -1137,8 +1137,8 @@ typedef struct or_handshake_state_t { unsigned int received_versions : 1; /** True iff we have received and processed an AUTH_CHALLENGE cell */ unsigned int received_auth_challenge : 1; - /** True iff we have received and processed a CERT cell. */ - unsigned int received_cert_cell : 1; + /** True iff we have received and processed a CERTS cell. */ + unsigned int received_certs_cell : 1; /** True iff we have received and processed an AUTHENTICATE cell */ unsigned int received_authenticate : 1; @@ -1171,7 +1171,7 @@ typedef struct or_handshake_state_t { crypto_digest_env_t *digest_received; /** @} */ - /** Certificates that a connection initiator sent us in a CERT cell; we're + /** Certificates that a connection initiator sent us in a CERTS cell; we're * holding on to them until we get an AUTHENTICATE cell. * * @{

1 0

[tor/master] Merge branch 'bug4360'
by nickm＠torproject.org 21 Nov '11

21 Nov '11

commit 0539c34c35380231c745dd9701b0884a20ee95d1 Merge: 3e9c86a a6eef61 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 10:48:02 2011 -0500 Merge branch 'bug4360' changes/bug4360 | 3 +++ src/or/command.c | 48 ++++++++++++++++++++++++------------------------ src/or/connection_or.c | 8 ++++---- src/or/connection_or.h | 2 +- src/or/or.h | 12 ++++++------ 5 files changed, 38 insertions(+), 35 deletions(-)

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit 017e3cad37007f1c33206d37f9ed6f856381331f Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 14:45:24 2011 +0000 Update translations for vidalia_help --- de/services.po | 51 +++++++++++++++++++++++++++++++++++++++++++++++++-- nl/server.po | 20 +++++++++++++++++++- 2 files changed, 68 insertions(+), 3 deletions(-) diff --git a/de/services.po b/de/services.po index a49bc7e..ea57798 100644 --- a/de/services.po +++ b/de/services.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-21 14:13+0000\n" +"PO-Revision-Date: 2011-11-21 14:42+0000\n" "Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -179,6 +179,12 @@ msgid "" "specify any target, Tor will redirect requests to the port specified in " "\"Virtual Port\" on localhost." msgstr "" +"Ziel (optional): Normalerweise sollten Sie Tor die Verbindungs-Anfragen an " +"einen anderen Port weiterleiten lassen als den den Sie bei Virtueller Port " +"angegeben haben. Hierzu können Sie Ziele bei einer physikalischen Adresse " +"spezifzizieren wie z.B. localhost:5222 (oder auf jedem anderen Port auf den " +"Ihr Server hört). Wenn Sie kein Ziel angeben dann wird TOR die Anfragen an " +"den Virtuellen Port auf localhost weiterleiten." #. type: Content of: <html><body><ul><li> #: en/services.html:81 @@ -196,6 +202,19 @@ msgid "" "disk to the new place. Finally, change the directory in Vidalia to the new " "location, enable the service again, and save the new configuration." msgstr "" +"Dienste Verzeichnis (benötigt): Tor mu0 einige Dateien in einem anderen " +"Verzeichnis abspeichern die für die versteckten Dienste benötigt werden wie " +"z.B. den Privaten Key und eine Host Datei die die Onion Adresse enthält. " +"Dieses Verzeichnis sollte getrennt sein von dem operativen Verzeichnis des " +"Dienstes sein. Ein guter Platz hierfür ist z.B. ein Unterverzeichnis im Tor " +"Daten Verzeichnis.-- Sie können nicht das Verzeichnis eines laufenden " +"Dienstes ändern (es würde keinen Sinn machen dies zu erlauben weil Vidalia " +"nicht in der Lage ist Verzeichnisse auf Ihrem System zu bewegen). Wenn Sie " +"einen versteckten Dienst in ein anders Verzeichnis verschieben wollen dann " +"gehen sie wie folgt vor: Deaktivieren Sie den Dienst in Vidalia und " +"speichern Sie die Konfiguration. Verschieben Sie dann das Verzeichnis an den" +" neuen Standort. Ändern Sie danach das Verzeichnis in Vidalia, starten Sie " +"den Dienst und speichern Sie die neue Konfiguration ab." #. type: Content of: <html><body><ul><li> #: en/services.html:95 @@ -205,6 +224,10 @@ msgid "" " currently unused service for later use. All non-enabled services are stored" " in the Vidalia-specific configuration file vidalia.conf." msgstr "" +"Aktiviert: Wenn dies nicht aktiviert ist dann wird Vidalia den Dienst nicht " +"konfigurieren. Dies kann nützlich sein um die Konfiguration von einem " +"derzeit unbenutzten Dienst für später aufzubewahren. Alle nicht aktivierten " +"Dienste werden in der Vidalia spezifischen Datei vidalia.conf abgespeichert." #. type: Content of: <html><body> #: en/services.html:103 @@ -228,6 +251,8 @@ msgid "" "Remove service: Permanently removes a hidden service configuration. (If you" " want to temporarily remove a service, uncheck its Enabled checkbox.)" msgstr "" +"Entfernen von Diensten: Das permanente entfernen von versteckten Diensten. " +"(Zum temporären deaktivieren verwenden Sie bitte die Funktion Aktiviert.)" #. type: Content of: <html><body><ul><li> #: en/services.html:111 @@ -235,11 +260,15 @@ msgid "" "Copy to clipboard: Copies the onion address to the clipboard, so that you " "can tell it to whoever shall be able to use your service." msgstr "" +"In den Zwischenspeicher kopieren: Kopiert die Onion-Adresse in den " +"Zwischenspeicher, so das Sie dies von dort aus jedem der Sie kennen solle " +"mitteilen können." #. type: Content of: <html><body><ul><li> #: en/services.html:114 msgid "Browse: Lets you browse to find a local hidden service directory." msgstr "" +"Browse: Browsen um eine lokales verstecktes Dienste Verzeichnis zu finden." #. type: Content of: <html><body> #: en/services.html:119 @@ -250,6 +279,8 @@ msgstr "<a name=\"advanced\"/>" #: en/services.html:120 msgid "How can I configure advanced hidden service settings?" msgstr "" +"Wie kann ich Einstellungen für die fortgeschrittenen versteckten Dienste " +"vornehmen ?" #. type: Content of: <html><body> #: en/services.html:122 @@ -258,6 +289,10 @@ msgid "" " forcing to use (or avoiding) certain nodes as introduction points, or " "providing multiple virtual ports for the same service." msgstr "" +"Tor erlaubt die detaillierte Einstellung für versteckte Dienste, wie z.B. " +"zwangsweises Benutzen (oder vermeiden) von bestimmten Nodes als " +"Vorstellungs-Punkte oder das bereitstellen verschiedener Virtuellen Ports " +"für den gleichen Dienst." #. type: Content of: <html><body> #: en/services.html:128 @@ -268,6 +303,13 @@ msgid "" " are editing your hidden services. If you specify more than one virtual " "port, only the first will be displayed and be editable." msgstr "" +"Wie auch immer, wir haben uns entschlossen das Ganze in Vidalia zu " +"vereinfachen und ausschließlich die meist verwendetsten Einstellungen " +"anzubieten. Für detailliertere Einstellungen editieren Sie bitte die torrc " +"Datei. Vidalia wird dort vorgenommene Änderungen nicht entfernen wenn Sie " +"ihre versteckten Dienste konfigurieren. Wenn Sie mehr als einen virtuellen " +"Port angegeben haben wird lediglich der erste angezeigt werden und editiert " +"werden können." #. type: Content of: <html><body> #: en/services.html:135 @@ -277,7 +319,7 @@ msgstr "<a name=\"client\"/>" #. type: Content of: <html><body><h3> #: en/services.html:136 msgid "How does Vidalia help me to access other hidden services?" -msgstr "" +msgstr "Wie hilft mir Vidalia beim Zugriff auf andere versteckte Dienste ?" #. type: Content of: <html><body> #: en/services.html:138 @@ -287,5 +329,10 @@ msgid "" "client application if it's not a web service), and Tor does the rest for " "you. There is no need to specifically configure Tor for that." msgstr "" +"Überhaupt nicht. Es gibt hierfür keine Notwendigkeit. Wenn Sie auf andere " +"versteckte Dienste zugreifen wollen dann geben Sie deren Onion Adresse in " +"Ihren Browser ein (oder in die entsprechende Anwendung falls es kein Web-" +"Dienst ist) und Tor erledigt dann den Rest für Sie. Es ist nicht notwendig " +"Tor hierfür speziell zu konfigurieren." diff --git a/nl/server.po b/nl/server.po index 63a8bf1..5cd166b 100644 --- a/nl/server.po +++ b/nl/server.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-21 14:00+0000\n" +"PO-Revision-Date: 2011-11-21 14:20+0000\n" "Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -492,6 +492,15 @@ msgid "" "href=\"http://192.168.1.1/\">http://192.168.1.1</a> in your Web browser. You" " should consult your router's instruction manual for more information." msgstr "" +"Als de Test knop constateert dat Vidalia niet in staat is om poort " +"forwarding voor je op te zetten, moet je deze functie op de router " +"inschakelen of handmatig poort forwarding opzetten. Sommige netwerkapparaten" +" hebben een functie genaamd Universal Plug-and-Play (UPnP). Als je je" +" router's beheerinterface kan benaderen, zoek dan naar een optie om UPnP in " +"te schakelen. De beheersinterface voor de meeste routers kan worden benaderd" +" door <a href=\"http://192.168.0.1/\">http://192.168.0.1</a> of <a " +"href=\"http://192.168.1.1/\">http://192.168.1.1</a> in uw webbrowser te " +"openen. Raadpleeg je router handleiding voor meer informatie." #. type: Content of: <html><body> #: en/server.html:229 @@ -506,5 +515,14 @@ msgid "" "Directory Port. The Directory Port is set to port 9030 by " "default on all operating systems." msgstr "" +"Als je handmatig poort forwarding in moet stellen dan heeft de website <a " +"href=\"http://www.portforward.com/english/routers/port_forwarding/routerindex.htm\">portforward.com</a>" +" instructies voor het instellen van port forwarding voor vele soorten " +"routers en firewalls. Op zijn minst moet je je relay poort forwarden," +" die is standaard ingesteld op poort 443 op Windows en 9001 op alle andere " +"besturingssystemen. Als je ook het vak Mirror de relay directory hebt" +" aangevinkt, dan moet je ook je directory port forwarden. De " +"directory poort is standaard ingesteld op poort 9030 op alle " +"besturingssystemen."

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit 5edb75d3c401b6aaccd759e7a783b58080beaec2 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 14:15:30 2011 +0000 Update translations for vidalia_help --- de/services.po | 15 ++++++++++++++- nl/server.po | 9 ++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/de/services.po b/de/services.po index e85602a..a49bc7e 100644 --- a/de/services.po +++ b/de/services.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-14 09:10+0000\n" +"PO-Revision-Date: 2011-11-21 14:13+0000\n" "Last-Translator: freedompenguin <sebastian(a)urbach.org>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -144,6 +144,14 @@ msgid "" "display the real onion address, you need to save your configuration and re-" "open the settings window." msgstr "" +"Onion Adresse (generiert): Die Dienste oder (oder Onion) Adresse wird von " +"TOR generiert damit ihr Dienst eindeutig identifiziert werden kann. Geben " +"Sie dieses Adresse denjenigen die Ihren Dienst nutzen können sollen. Am " +"Besten tun Sie dies per Copy & Paste um Rechtschreib-Fehler zu vermeiden. " +"Wenn Sie gerade erst eine versteckten Dienst erstellt haben dann ist dort " +"\"[Erstellt von Tor]\" eingetragen. Um dies zu ändern damit die richtige " +"Onion -Adresse angezeigt wird speichern Sie bitte Ihre Änderungen ab und " +"öffnen das Einstellungen-Fenster." #. type: Content of: <html><body><ul><li> #: en/services.html:68 @@ -154,6 +162,11 @@ msgid "" "port usually has nothing to do with firewall settings, because it is only " "used Tor-internally." msgstr "" +"Virtueller Port (benötigt): Dies ist der TCP-Port den die Clients benötigen " +"um auf ihren Dienst zuzugreifen. Normalerweise sollten Sie hier den " +"typischen Port des jeweiligen Dienstes verwenden wie z.B. Port 80 für HTTP. " +"Dieser Port hat normalerweise nichts mit der Firewall zu tun weil er " +"ausschließlich TOR intern verwendet wird." #. type: Content of: <html><body><ul><li> #: en/services.html:73 diff --git a/nl/server.po b/nl/server.po index 66369f3..63a8bf1 100644 --- a/nl/server.po +++ b/nl/server.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2010-06-26 17:00+0200\n" -"PO-Revision-Date: 2011-11-21 13:13+0000\n" +"PO-Revision-Date: 2011-11-21 14:00+0000\n" "Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -437,6 +437,13 @@ msgid "" "want to run a Tor relay, however, other Tor clients and relays must be able " "to connect to your relay through your home router or firewall." msgstr "" +"Veel thuisgebruikers verbinden met het internet via een router, die " +"meerdere computers in een lokaal netwerk in staat stelt om dezelfde " +"internetverbinding te delen. Sommige gebruikers kunnen ook achter een " +"firewall zitten die inkomende verbindingen naar uw computer vanaf " +"andere computers op het internet blokkeert. Als je echter een Tor relay wilt" +" draaien, moeten andere Tor clients en relay's in staat zijn om verbinding " +"te maken met je relay via je router of firewall." #. type: Content of: <html><body> #: en/server.html:200

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit 2670c964f5f65093f0aa8b4e1b51cbc73be68036 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 14:15:03 2011 +0000 Update translations for orbot --- values-de/strings.xml | 76 ++++++++++++++++++++++++------------------------ 1 files changed, 38 insertions(+), 38 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index 77d0211..680b807 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -141,45 +141,45 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="privoxy_is_running_on_port_">Privoxy läuft auf Port:</string> <string name="setting_up_port_based_transparent_proxying_">Richte Port-basiertes transparentes Proxiying ein...</string> <string name="bridge_error">Bridge Fehler</string> - <string name="bridge_requires_ip"></string> - <string name="send_email_for_bridges"></string> + <string name="bridge_requires_ip">Um das Bridge-Feature nutzen zu können müssen Sie mindestens eine IP-Adresse eingeben.</string> + <string name="send_email_for_bridges">Senden Sie von Ihrem gmail Account ein e-Mail an bridges(a)torproject.org mit dem Text \"get bridges\" im Nachrichten-Feld.</string> <string name="error">Fehler</string> - <string name="your_reachableaddresses_settings_caused_an_exception_"></string> - <string name="your_relay_settings_caused_an_exception_"></string> - <string name="exit_nodes"></string> - <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop"></string> - <string name="enter_exit_nodes"></string> - <string name="exclude_nodes"></string> - <string name="fingerprints_nicks_countries_and_addresses_to_exclude"></string> - <string name="enter_exclude_nodes"></string> - <string name="strict_nodes"></string> - <string name="use_only_these_specified_nodes"></string> - <string name="bridges"></string> - <string name="use_bridges"></string> - <string name="enable_alternate_entrance_nodes_into_the_tor_network"></string> - <string name="ip_address_and_port_of_bridges"></string> - <string name="enter_bridge_addresses"></string> - <string name="relays"></string> - <string name="relaying"></string> - <string name="enable_your_device_to_be_a_non_exit_relay"></string> - <string name="relay_port"></string> - <string name="listening_port_for_your_tor_relay"></string> - <string name="enter_or_port"></string> - <string name="relay_nickname"></string> - <string name="the_nickname_for_your_tor_relay"></string> - <string name="enter_a_custom_relay_nickname"></string> + <string name="your_reachableaddresses_settings_caused_an_exception_">Ihre eingestellte erreichbare e-Mail Adresse hat einen Ausnahme-Fehler erzeugt.</string> + <string name="your_relay_settings_caused_an_exception_">Ihre Relay Einstellungen haben einen Ausnahme-Fehler erzeugt.</string> + <string name="exit_nodes">Exit Nodes</string> + <string name="fingerprints_nicks_countries_and_addresses_for_the_last_hop">Fingerabdrücke, Spitz-Namen, Länder und Adressen für den letzten Knoten-Punkt.</string> + <string name="enter_exit_nodes">Tragen Sie die Exit-Nodes ein.</string> + <string name="exclude_nodes">Nodes Ausnahmen</string> + <string name="fingerprints_nicks_countries_and_addresses_to_exclude">Fingerabdrücke, Spitz-Namen, Länder und Adressen die ausgenommen werden sollen.</string> + <string name="enter_exclude_nodes">Geben Sie die auszunehmenden Nodes ein.</string> + <string name="strict_nodes">Strikte Nodes</string> + <string name="use_only_these_specified_nodes">Benutze *ausschließlich* diese angegebenen Nodes</string> + <string name="bridges">Bridges</string> + <string name="use_bridges">Benutze Bridges</string> + <string name="enable_alternate_entrance_nodes_into_the_tor_network">Benutze alternative Eingangs-Nodes in das TOR-Netzwerk</string> + <string name="ip_address_and_port_of_bridges">IP Adresse und Port der Bridges</string> + <string name="enter_bridge_addresses">Geben Sie die Bridge_Adressen ein</string> + <string name="relays">Relays</string> + <string name="relaying">Relaying</string> + <string name="enable_your_device_to_be_a_non_exit_relay">Aktivieren das Ihr Gerät ein non-exit Relay ist.</string> + <string name="relay_port">Relay Port</string> + <string name="listening_port_for_your_tor_relay">Port auf den bei Ihrem TOR-Relay gehört werden soll</string> + <string name="enter_or_port">OR-Port eingeben</string> + <string name="relay_nickname">Relay Spitzname</string> + <string name="the_nickname_for_your_tor_relay">Der Spitzname für Ihren TOR-Relay</string> + <string name="enter_a_custom_relay_nickname">Geben Sie einen selbsterstellten Relay Spitznamen an</string> <string name="reachable_addresses">Erreichbare Adressen</string> - <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies"></string> + <string name="run_as_a_client_behind_a_firewall_with_restrictive_policies">Als Client hinter einer Firewall mit restriktiven Regeln betreiben</string> <string name="reachable_ports">Erreichbare Ports</string> - <string name="ports_reachable_behind_a_restrictive_firewall"></string> - <string name="enter_ports"></string> - <string name="enable_hidden_services"></string> - <string name="run_servers_accessible_via_the_tor_network"></string> - <string name="enter_localhost_ports_for_hidden_services"></string> - <string name="hidden_service_ports"></string> - <string name="the_addressable_name_for_your_hidden_service_generated_automatically_"></string> + <string name="ports_reachable_behind_a_restrictive_firewall">Die Ports sind hinter einer restriktiven Firewall erreichbar</string> + <string name="enter_ports">Ports eingeben</string> + <string name="enable_hidden_services">Versteckte Dienste aktivieren</string> + <string name="run_servers_accessible_via_the_tor_network">Betrieben von Servern auf die vom TOR-Netzwerk aus zugegriffen werden kann.</string> + <string name="enter_localhost_ports_for_hidden_services">TRagen Sie die lokelen Ports für die versteckten Dienste ein</string> + <string name="hidden_service_ports">Versteckte Dienste Ports</string> + <string name="the_addressable_name_for_your_hidden_service_generated_automatically_">Der adressierbare Name für Ihre versteckten Dienste (werden automatisch generiert)</string> <string name="enable_debug_log_to_output_must_use_adb_or_alogcat_to_view_">Aktiviere Debug Log Ausgabe (benötigt adb oder alogcat zur Ansicht)</string> - <string name="project_home"></string> + <string name="project_home">Heimat des Projekt(s):</string> <string name="project_urls">https://www.torproject.org/docs/android\nhttps://guardianproject.info/apps/…</string> <string name="the_tor_license">Die Tor Lizenz</string> <string name="https_torproject_org">https://torproject.org</string> @@ -188,10 +188,10 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="libevent_version">LibEvent v1.4.13: http://www.monkey.org/~provos/libevent/</string> <string name="privoxy_version">Privoxy v3.0.12: http://www.privoxy.org</string> <string name="iptables_version">Iptables v1.4.7: http://www.netfilter.org</string> - <string name="hidden_service_request"></string> + <string name="hidden_service_request">Eine Anwendungen möchte den Port für versteckte Dienste %S öffnen. Dies ist sicher wenn Sie der Anwendung vertrauen.</string> <string name="found_existing_tor_process">existierender Tor Prozess gefunden...</string> <string name="something_bad_happened">Etwasist schief gelaufen. Bitte Log prüfen</string> - <string name="hidden_service_on"></string> - <string name="unable_to_read_hidden_service_name"></string> + <string name="hidden_service_on">Verstckte Dienste auf:</string> + <string name="unable_to_read_hidden_service_name">Kann den Namen des versteckten Dienstes nicht lesen</string> <string name="unable_to_start_tor">Kann Tor nicht starten:</string> </resources>

1 0

[translation/orbot] Update translations for orbot
by translation＠torproject.org 21 Nov '11

21 Nov '11

commit 97c74b894b465d07abc4cc2b1015c18b247bca1c Author: Translation commit bot <translation(a)torproject.org> Date: Mon Nov 21 13:45:04 2011 +0000 Update translations for orbot --- values-de/strings.xml | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/values-de/strings.xml b/values-de/strings.xml index 505785a..77d0211 100644 --- a/values-de/strings.xml +++ b/values-de/strings.xml @@ -131,8 +131,8 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="pref_proxy_port_summary">Proxy Server Port</string> <string name="pref_proxy_port_dialog">Proxy Port eingeben</string> <string name="status">Status</string> - <string name="setting_up_full_transparent_proxying_"></string> - <string name="setting_up_app_based_transparent_proxying_"></string> + <string name="setting_up_full_transparent_proxying_">Einstellen des voll transparenten Proxys...</string> + <string name="setting_up_app_based_transparent_proxying_">Einstellen des Anwendungs-basierten transparenten Proxys...</string> <string name="transparent_proxying_enabled">Transparentes Proxying aktiviert</string> <string name="transproxy_enabled_for_tethering_">TransProxy für Tethering aktiviert!</string> <string name="warning_error_starting_transparent_proxying_">WARNUNG: Fehler beim Starten von transparentem Proxying!</string> @@ -140,7 +140,7 @@ Besuchen Sie https://guardianproject.info/apps/orbot oder senden Sie eine E-Mail <string name="couldn_t_start_tor_process_">Konnte Tor Prozess nicht starten:</string> <string name="privoxy_is_running_on_port_">Privoxy läuft auf Port:</string> <string name="setting_up_port_based_transparent_proxying_">Richte Port-basiertes transparentes Proxiying ein...</string> - <string name="bridge_error"></string> + <string name="bridge_error">Bridge Fehler</string> <string name="bridge_requires_ip"></string> <string name="send_email_for_bridges"></string> <string name="error">Fehler</string>

1 0