- tor-commits - lists.torproject.org

[translation/gettor] Update translations for gettor
by translation＠torproject.org 26 Dec '11

26 Dec '11

commit c4ec4d073689d2fb9a0765bc55f5d7cddb081380 Author: Translation commit bot <translation(a)torproject.org> Date: Mon Dec 26 12:15:03 2011 +0000 Update translations for gettor --- fa/gettor.po | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/fa/gettor.po b/fa/gettor.po index 035e4de..027d036 100644 --- a/fa/gettor.po +++ b/fa/gettor.po @@ -5,13 +5,14 @@ # Translators: # <behravanhamed(a)gmail.com>, 2011. # Jacob Appelbaum <jacob(a)appelbaum.net>, 2009. +# martin luther king <sabztunnel(a)gmail.com>, 2011. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2011-11-13 22:01+0100\n" -"PO-Revision-Date: 2011-11-14 04:06+0000\n" -"Last-Translator: behravan <behravanhamed(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-26 12:06+0000\n" +"Last-Translator: martin luther king <sabztunnel(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -72,12 +73,22 @@ msgid "" " linux-x86_64\n" " source" msgstr "" +"به محض اینکه شما من را از بسته نرم افزاری مورد نظر مطلع کنید، من آن را برای شما خواهم فرستاد. لطفا از بسته‌های نرم افزاری زیر یکی‌ را انتخاب کنید، \n" +"\n" +" windows \n" +" macos-i386\n" +" macos-ppc\n" +" linux-i386\n" +" linux-x86_64\n" +" source" #: lib/gettor/i18n.py:56 msgid "" "Please reply to this mail, and tell me a single package name anywhere \n" "in the body of your email." msgstr "" +"لطفا به این نامه پاسخ دهید، و نام بسته نرم افزاری مربوط به سیستم عامل خود را" +" در بدنهٔ پاسخ خود بنویسید." #: lib/gettor/i18n.py:59 msgid ""

1 0

[tor/master] Log what fraction of EXTEND cells have died for being non-early
by arma＠torproject.org 25 Dec '11

25 Dec '11

commit 847541ce5db48152576639d7adc0a6209b661be9 Author: Nick Mathewson <nickm(a)torproject.org> Date: Mon Nov 21 17:51:46 2011 -0500 Log what fraction of EXTEND cells have died for being non-early --- src/or/relay.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index 60d439a..fdc2600 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1188,7 +1188,9 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, connection_mark_and_flush(TO_CONN(conn)); } return 0; - case RELAY_COMMAND_EXTEND: + case RELAY_COMMAND_EXTEND: { + static uint64_t total_n_extend=0, total_nonearly=0; + total_n_extend++; if (conn) { log_fn(LOG_PROTOCOL_WARN, domain, "'extend' cell received for non-zero stream. Dropping."); @@ -1200,10 +1202,15 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, RATELIM_INIT(EARLY_WARNING_INTERVAL); char *m; if (cell->command == CELL_RELAY) { + ++total_nonearly; if ((m = rate_limit_log(&early_warning_limit, approx_time()))) { /* XXXX make this a protocol_warn once we're happier with it*/ + double percentage = ((double)total_nonearly)/total_n_extend; + percentage *= 100; log_fn(LOG_WARN, domain, "EXTEND cell received, " "but not via RELAY_EARLY. Dropping.%s", m); + log_fn(LOG_WARN, domain, " (We have dropped %.02f%% of all " + "EXTEND cells for this reason)", percentage); tor_free(m); } } else { @@ -1214,6 +1221,7 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, return 0; } return circuit_extend(cell, circ); + } case RELAY_COMMAND_EXTENDED: if (!layer_hint) { log_fn(LOG_PROTOCOL_WARN, LD_PROTOCOL,

1 0

[tor/master] Merge remote-tracking branch 'nickm/prop110_v2'
by arma＠torproject.org 25 Dec '11

25 Dec '11

commit 3aade2fab7030211b7a8ae6ab1bd310c378be462 Merge: 86079a8 2710a96 Author: Roger Dingledine <arma(a)torproject.org> Date: Sun Dec 25 17:43:09 2011 -0500 Merge remote-tracking branch 'nickm/prop110_v2' changes/prop110 | 7 +++++++ src/or/relay.c | 30 +++++++++++++++++++++++++++++- 2 files changed, 36 insertions(+), 1 deletions(-)

1 0

[tor/master] Implement the last of proposal 110
by arma＠torproject.org 25 Dec '11

25 Dec '11

commit 0187bd872885343761174218529aed7058f8d636 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 28 10:51:21 2011 -0400 Implement the last of proposal 110 Reject all EXTEND requests not received in a relay_early cell --- changes/prop110 | 7 +++++++ src/or/relay.c | 19 +++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-) diff --git a/changes/prop110 b/changes/prop110 new file mode 100644 index 0000000..843595e --- /dev/null +++ b/changes/prop110 @@ -0,0 +1,7 @@ + o Major features: + - Now that Tor 0.2.0.x is completely deprecated, we can enable the + final part of "Proposal 110: Avoiding infinite length circuits" + by refusing all circuit-extend requests that do not appear in a + "relay_early" cell. This change helps Tor to resist a class of + denial-of-service attacks by limiting the maximum circuit length. + diff --git a/src/or/relay.c b/src/or/relay.c index 6cf4b73..60d439a 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1194,6 +1194,25 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "'extend' cell received for non-zero stream. Dropping."); return 0; } + if (cell->command != CELL_RELAY_EARLY) { +#define EARLY_WARNING_INTERVAL 900 + static ratelim_t early_warning_limit = + RATELIM_INIT(EARLY_WARNING_INTERVAL); + char *m; + if (cell->command == CELL_RELAY) { + if ((m = rate_limit_log(&early_warning_limit, approx_time()))) { + /* XXXX make this a protocol_warn once we're happier with it*/ + log_fn(LOG_WARN, domain, "EXTEND cell received, " + "but not via RELAY_EARLY. Dropping.%s", m); + tor_free(m); + } + } else { + log_fn(LOG_WARN, domain, + "EXTEND cell received, in a cell with type %d! Dropping.", + cell->command); + } + return 0; + } return circuit_extend(cell, circ); case RELAY_COMMAND_EXTENDED: if (!layer_hint) {

1 0

[tor/master] Allow prop110 violations if AllowNonearlyExtend is set in consensus
by arma＠torproject.org 25 Dec '11

25 Dec '11

commit 2710a96ba4a25bf7d2f3a8ddca7120fbb6aa2cb0 Author: Nick Mathewson <nickm(a)torproject.org> Date: Thu Dec 22 10:12:49 2011 -0500 Allow prop110 violations if AllowNonearlyExtend is set in consensus --- src/or/relay.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/src/or/relay.c b/src/or/relay.c index fdc2600..e5790dc 100644 --- a/src/or/relay.c +++ b/src/or/relay.c @@ -1196,7 +1196,8 @@ connection_edge_process_relay_cell(cell_t *cell, circuit_t *circ, "'extend' cell received for non-zero stream. Dropping."); return 0; } - if (cell->command != CELL_RELAY_EARLY) { + if (cell->command != CELL_RELAY_EARLY && + !networkstatus_get_param(NULL,"AllowNonearlyExtend",0,0,1)) { #define EARLY_WARNING_INTERVAL 900 static ratelim_t early_warning_limit = RATELIM_INIT(EARLY_WARNING_INTERVAL);

1 0

[vidalia/master] Make the non exit option in Sharing backward compatible with Vidalia < 0.2.14
by chiiph＠torproject.org 25 Dec '11

25 Dec '11

commit 56d71643ef85f8bb4712d3d36e2597e9d410394c Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Dec 25 11:28:24 2011 -0300 Make the non exit option in Sharing backward compatible with Vidalia < 0.2.14 --- changes/bug4642 | 2 ++ src/vidalia/config/ServerPage.cpp | 16 +++++++++++----- src/vidalia/config/ServerSettings.cpp | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/changes/bug4642 b/changes/bug4642 new file mode 100644 index 0000000..0fc0b42 --- /dev/null +++ b/changes/bug4642 @@ -0,0 +1,2 @@ + o Make the non exit relay option backward compatible with Vidalia < + 0.2.14 so that it doesn't confuse users. Fixes bug 4642. \ No newline at end of file diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index 28308d8..5fa20a9 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -350,11 +350,17 @@ ServerPage::load() { if (_settings->isBridgeEnabled()) ui.rdoBridgeMode->setChecked(true); - else if (_settings->isNonExitEnabled()) - ui.rdoNonExitMode->setChecked(true); - else if (_settings->isServerEnabled()) - ui.rdoServerMode->setChecked(true); - else + else if (_settings->isNonExitEnabled()) { + if(_settings->getExitPolicy().toString() != "reject *:*") + ui.rdoServerMode->setChecked(true); + else + ui.rdoNonExitMode->setChecked(true); + } else if (_settings->isServerEnabled()) { + if(_settings->getExitPolicy().toString() == "reject *:*") + ui.rdoNonExitMode->setChecked(true); + else + ui.rdoServerMode->setChecked(true); + } else ui.rdoClientMode->setChecked(true); ui.lineServerNickname->setText(_settings->getNickname()); diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp index f1caa53..1c1e687 100644 --- a/src/vidalia/config/ServerSettings.cpp +++ b/src/vidalia/config/ServerSettings.cpp @@ -100,8 +100,8 @@ ServerSettings::confValues() : "0")); /* Server Exit Policy */ conf.insert(SETTING_EXITPOLICY, - (isBridgeEnabled() ? "reject *:*" - : localValue(SETTING_EXITPOLICY).toString())); + ((isBridgeEnabled() || isNonExitEnabled()) ? "reject *:*" + : localValue(SETTING_EXITPOLICY).toString())); /* Server bandwidth settings */ conf.insert((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_RATE

1 0

[vidalia/alpha] Make the non exit option in Sharing backward compatible with Vidalia < 0.2.14
by chiiph＠torproject.org 25 Dec '11

25 Dec '11

commit aa6bfbc5c5a582866058cee961bee983cb4fbcfb Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Dec 25 11:28:24 2011 -0300 Make the non exit option in Sharing backward compatible with Vidalia < 0.2.14 --- changes/bug4642 | 2 ++ src/vidalia/config/ServerPage.cpp | 16 +++++++++++----- src/vidalia/config/ServerSettings.cpp | 4 ++-- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/changes/bug4642 b/changes/bug4642 new file mode 100644 index 0000000..0fc0b42 --- /dev/null +++ b/changes/bug4642 @@ -0,0 +1,2 @@ + o Make the non exit relay option backward compatible with Vidalia < + 0.2.14 so that it doesn't confuse users. Fixes bug 4642. \ No newline at end of file diff --git a/src/vidalia/config/ServerPage.cpp b/src/vidalia/config/ServerPage.cpp index 203ce86..51514ca 100644 --- a/src/vidalia/config/ServerPage.cpp +++ b/src/vidalia/config/ServerPage.cpp @@ -351,11 +351,17 @@ ServerPage::load() { if (_settings->isBridgeEnabled()) ui.rdoBridgeMode->setChecked(true); - else if (_settings->isNonExitEnabled()) - ui.rdoNonExitMode->setChecked(true); - else if (_settings->isServerEnabled()) - ui.rdoServerMode->setChecked(true); - else + else if (_settings->isNonExitEnabled()) { + if(_settings->getExitPolicy().toString() != "reject *:*") + ui.rdoServerMode->setChecked(true); + else + ui.rdoNonExitMode->setChecked(true); + } else if (_settings->isServerEnabled()) { + if(_settings->getExitPolicy().toString() == "reject *:*") + ui.rdoNonExitMode->setChecked(true); + else + ui.rdoServerMode->setChecked(true); + } else ui.rdoClientMode->setChecked(true); ui.lineServerNickname->setText(_settings->getNickname()); diff --git a/src/vidalia/config/ServerSettings.cpp b/src/vidalia/config/ServerSettings.cpp index 76e3361..309d712 100644 --- a/src/vidalia/config/ServerSettings.cpp +++ b/src/vidalia/config/ServerSettings.cpp @@ -100,8 +100,8 @@ ServerSettings::confValues() : "0")); /* Server Exit Policy */ conf.insert(SETTING_EXITPOLICY, - (isBridgeEnabled() ? "reject *:*" - : localValue(SETTING_EXITPOLICY).toString())); + ((isBridgeEnabled() || isNonExitEnabled()) ? "reject *:*" + : localValue(SETTING_EXITPOLICY).toString())); /* Server bandwidth settings */ conf.insert((torVersion >= 0x020001 ? SETTING_RELAY_BANDWIDTH_RATE

1 0

[vidalia/alpha] Default data directory to Local instead of Roaming AppData
by chiiph＠torproject.org 25 Dec '11

25 Dec '11

commit cc42ab6331437910ff57a2d38021fb8e7120b864 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Dec 25 10:37:59 2011 -0300 Default data directory to Local instead of Roaming AppData --- changes/bug2319 | 2 ++ src/common/win32.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/changes/bug2319 b/changes/bug2319 new file mode 100644 index 0000000..fe6ee5b --- /dev/null +++ b/changes/bug2319 @@ -0,0 +1,2 @@ + o Make the default data directory in windows be located in the Local + AppData instead of the Roaming one. Fixes bug 2319. \ No newline at end of file diff --git a/src/common/win32.cpp b/src/common/win32.cpp index 814b5a1..931da7a 100644 --- a/src/common/win32.cpp +++ b/src/common/win32.cpp @@ -86,7 +86,7 @@ QString win32_app_data_folder() { return win32_get_folder_location( - CSIDL_APPDATA, QDir::homePath() + "\\Application Data"); + CSIDL_LOCAL_APPDATA, QDir::homePath() + "\\Application Data"); } /** Returns the value in keyName at keyLocation.

1 0

[vidalia/master] Default data directory to Local instead of Roaming AppData
by chiiph＠torproject.org 25 Dec '11

25 Dec '11

commit bd677b212b977e63d306e3cc2665c569e42b116d Author: Tomás Touceda <chiiph(a)torproject.org> Date: Sun Dec 25 10:37:59 2011 -0300 Default data directory to Local instead of Roaming AppData --- changes/bug2319 | 2 ++ src/common/win32.cpp | 2 +- 2 files changed, 3 insertions(+), 1 deletions(-) diff --git a/changes/bug2319 b/changes/bug2319 new file mode 100644 index 0000000..fe6ee5b --- /dev/null +++ b/changes/bug2319 @@ -0,0 +1,2 @@ + o Make the default data directory in windows be located in the Local + AppData instead of the Roaming one. Fixes bug 2319. \ No newline at end of file diff --git a/src/common/win32.cpp b/src/common/win32.cpp index 814b5a1..931da7a 100644 --- a/src/common/win32.cpp +++ b/src/common/win32.cpp @@ -86,7 +86,7 @@ QString win32_app_data_folder() { return win32_get_folder_location( - CSIDL_APPDATA, QDir::homePath() + "\\Application Data"); + CSIDL_LOCAL_APPDATA, QDir::homePath() + "\\Application Data"); } /** Returns the value in keyName at keyLocation.

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 25 Dec '11

25 Dec '11

commit 307085c85e48c39ee9ba0db6bb7761c3fe52dd93 Author: Translation commit bot <translation(a)torproject.org> Date: Sun Dec 25 09:15:26 2011 +0000 Update translations for vidalia_help --- ar/config.po | 21 +++++---------------- da/config.po | 14 +++++--------- de/config.po | 26 ++++++-------------------- es/config.po | 24 +++++------------------- fa/config.po | 16 ++++------------ fr/config.po | 21 ++++----------------- hu/config.po | 22 +++++----------------- it/config.po | 23 +++++------------------ my/config.po | 22 ++++------------------ nl/config.po | 25 ++++++------------------- ru/config.po | 21 ++++----------------- templates/config.pot | 24 ++++++++---------------- tr/config.po | 14 +++++--------- 13 files changed, 66 insertions(+), 207 deletions(-) diff --git a/ar/config.po b/ar/config.po index cd9cbef..ed4b4fc 100644 --- a/ar/config.po +++ b/ar/config.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 16:58+0200\n" -"PO-Revision-Date: 2011-04-12 15:33+0000\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -166,22 +166,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"وحتى لو كنت لا تعرف أي عناوين للجسور ، قد يكون اختيار هذا الخيار مفيدا. سوف " -"يقوم تور بتشفير طلبات الدليل الخاص به ، والتي يمكنها من هزيمة آليات الحظر " -"التي تحاول منع طلبات تور من الحصول على معلومات عن تبديلات أخرى. إذا منعت " -"تبديلات تور العادية ايضا، ثم كنت بحاجة لمعرفة عنوان تتابع جسر بطريقة ما أو " -"بأخرى وإضافته هنا. راجع موضوع المساعدة فى <a " -"href=\"bridges.html#finding\">إيجاد تبديلات للجسور</a> لمزيد من المعلومات " -"حول كيفية معرفة عناوين جديدة لتتابع الجسور وبصماتها ." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/da/config.po b/da/config.po index 7b6fcc6..e7a866f 100644 --- a/da/config.po +++ b/da/config.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 16:58+0200\n" -"PO-Revision-Date: 2011-04-12 15:33+0000\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -150,14 +150,10 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" #. type: Content of: <html><body> diff --git a/de/config.po b/de/config.po index e469bad..31cd3f5 100644 --- a/de/config.po +++ b/de/config.po @@ -7,8 +7,8 @@ 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 16:58+0200\n" -"PO-Revision-Date: 2011-03-22 16:45+0000\n" -"Last-Translator: NilsP <gibsorter(a)gmx.de>\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" +"Last-Translator: Nils <gibsorter(a)gmx.de>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -180,25 +180,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Gerade wenn Sie über keine Adresse eines Bridge Relays verfügen " -"kann es hilfreich sein diese Einstellung zu aktivieren. Tor wird seine " -"Verzeichnisanfragen verschlüsseln, wodurch Sperrmechanismen umgangen " -"werden können, die Tors Anfragen nach Informationen für andere " -"Relays herausfiltern würden. Wenn Verbindungen zu normalen Tor Servern " -"ebenfalls gesperrt werden, dann müssen Sie die Adresse eines anderen " -"Relaysausfindig machen und diese hier eintragen. Sehen Sie dazu den " -"Hilfeeintrag unter <a href=\"bridges.html#finding\">Einen Relay-Server " -"finden</a> wie Sie die Adresse eines Relays finden können.and " -"fingerprints." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/es/config.po b/es/config.po index afe0709..dfd2332 100644 --- a/es/config.po +++ b/es/config.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 16:58+0200\n" -"PO-Revision-Date: 2011-11-18 02:49+0000\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" "Last-Translator: Gioyik <gioyik(a)gmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -178,25 +178,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Incluso si usted no sabe todas las direcciones de transmisor de puente, " -"marcando esta casilla de verificación todavía puede ser útil. Tor cifrará " -"sus solicitudes de directorio, que puede derrotar a los mecanismos de " -"bloqueo que tratan de filtrar Tor solicitudes de información acerca de otros" -" relés. Si las conexiones a la normalidad los repetidores Tor también se " -"bloquean, entonces usted tendrá que aprender una dirección transmisor de " -"puente de alguna manera y añadir aquí. Ver el tema de ayuda en <a " -"href=\"bridges.html#finding\">la búsqueda relés puente</a> para obtener más " -"información sobre cómo aprender nuevas direcciones repetidor de puente y las" -" huellas dactilares." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/fa/config.po b/fa/config.po index bab5c7a..556e475 100644 --- a/fa/config.po +++ b/fa/config.po @@ -170,19 +170,11 @@ msgstr "128.213.48.13:8080105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"حتی اگر آدرس هیچ پل بازپخشی را ندارید، مراجعه به این چک-باکس می تواند سودمند" -" باشد. Tor با پنهان کردن درخواست فهرست خود برای گرفتن اطلاعات درباره دیگر " -"بازپخش ها، اقدام مکانیسمی که باعث مسدود شدن درخواست Tor می شود را خنثی می " -"کند." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/fr/config.po b/fr/config.po index 512fdbf..9663f18 100644 --- a/fr/config.po +++ b/fr/config.po @@ -176,24 +176,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Même si vous ne connaissez pas d'adresse de passerelle, il peut être utile " -"de cocher cette case. Tor chiffrera alors ses requêtes d'annuaire, ce qui " -"peut contourner les mécanismes de blocage qui cherchent à filtrer les " -"requêtes Tor qui concernent l'information sur d'autres relais. Si les " -"connexions aux relais normaux sont également bloquées, il vous faudra " -"trouver l'adresse d'une passerelle d'une manière ou d'une autre pour " -"l'ajouter ici. Consultez cette d'aide sur la manière de <a " -"href=\"bridges.html#finding\">trouver une passerelle</a> en récupérant des " -"adresses et des empreintes." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/hu/config.po b/hu/config.po index 45410ba..a2af8c8 100644 --- a/hu/config.po +++ b/hu/config.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 16:58+0200\n" -"PO-Revision-Date: 2011-10-11 23:30+0000\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" "Last-Translator: vargaviktor <viktor.varga(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -172,23 +172,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Még ha nem is rendelkezik hídkapcsolati címekkel, ennek a beállításnak a " -"címe hasznos lehet. A Tor titkosítja a címtár lekérést, ami megakadályozhat " -"néhány szűrési módszert, amely azon alapul, hogy a Tor kéréseket a többi " -"Elosztó felé szűri. Ha a kapcsolatok a normál Elosztók felé blokkoltak, " -"akkor szüksége van néhány Híd címére, és itt hozzá kell adnia azokat. " -"Tekintse meg a <a href=\"bridges.html#finding\">hídkapcsolati elosztók " -"beszerzése</a> szakaszt, hogy több információt kapjon az ilyen címek és " -"ujjlenyomatok beszerzéséről." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/it/config.po b/it/config.po index db29b40..5aefe1e 100644 --- a/it/config.po +++ b/it/config.po @@ -7,7 +7,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 16:58+0200\n" -"PO-Revision-Date: 2011-10-25 21:50+0000\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" "Last-Translator: fetidyoo <tru74368(a)yahoo.com>\n" "Language-Team: Italian (http://www.transifex.net/projects/p/torproject/team/it/)\n" "MIME-Version: 1.0\n" @@ -176,24 +176,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Anche se non si conosce alcun indirizzo relay bridge, constrassegnare questa" -" casella di controllo potrebbe rivelarsi utile. Tor crittograferà le " -"richieste di directory che impediscono il meccanismo di blocco che tenta di " -"filtrare le richieste di Tor relative alle informazioni su altri relay. Se " -"vengono bloccati anche i collegamenti a relay Tor normali, occorrerà " -"ottenere in qualche modo un indirizzo di relay bridge e aggiungerlo. Vedere " -"l'argomento della guida <a href=\"bridges.html#finding\">Come trovare relay " -"bridge</a> per ulteriori informazioni su come ottenere nuovi indirizzi relay" -" bridge e fingerprint." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/my/config.po b/my/config.po index c378a86..037ca89 100644 --- a/my/config.po +++ b/my/config.po @@ -177,25 +177,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"bridge relay လိပ္စာမ်ားကို သင္မသိဘူးဆိုရင္ေတာင္ ဤcheckbox ကို check " -"လုပ္ျခင္းအားျဖင့္ အကူညီရရွိပါလိမ့္မည္။ အျခား relays မ်ားအတြက္ " -"သတင္းအခ်က္အလက္မ်ားကို Tor မွ ေတာင္းဆိုမႈမ်ားကို စီစစ္ရန္ ၾကိဳးစားေသာ " -"ကိရိယာမ်ားကို directory ေတာင္းဆိုမႈမ်ားအား Tor က encrypt လုပ္ျခင္းအားျဖင့္ " -"ေက်ာ္လႊားႏိုင္ပါတယ္။ ပံုမွန္ Tor relays မ်ား၏ ခ်ိတ္ဆက္မႈမ်ားကို " -"ပိတ္ဆို႔ခံလိုက္ရလွ်င္ bridge relay လိပ္စာ ဘယ္လိုနည္းနဲ႔ ဤေနရာတြင္ " -"ထည့္သြင္းရမည္ ဆိုတာကို ေလ့လာရပါလိမ့္မယ္။ bridge relay လိပ္စာအသစ္မ်ားႏွင့္ " -"fingerprints မ်ား အေၾကာင္း သတင္းအခ်က္လက္မ်ားကို <a " -"href=\"bridges.html#finding\">bridge relaysမ်ားရွာေဖြျခင္း</a> ရွိ " -"အကူအညီက႑ကို ၾကည့္ရႈပါ။" #. type: Content of: <html><body> #: en/config.html:100 diff --git a/nl/config.po b/nl/config.po index 777bd7f..eaff1d6 100644 --- a/nl/config.po +++ b/nl/config.po @@ -8,8 +8,8 @@ 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 16:58+0200\n" -"PO-Revision-Date: 2011-11-18 10:57+0000\n" -"Last-Translator: Shondoit <shondoit+transifex(a)gmail.com>\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" +"Last-Translator: Shondoit Walker <shondoit+transifex(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -170,24 +170,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Zelfs als je geen bridge relais-adressen kent, kan het aanvinken van dit " -"vakje nog steeds nuttig zijn. Tor zal zijn directory verzoeken versleutelen," -" waardoor blokkeringsmechanismen die proberen om Tor's verzoeken om " -"informatie over andere relais te filteren niet werken. Als verbindingen naar" -" normale Tor relais ook geblokkeerd zijn, dan moet u een bridge relais-" -"adres op een of andere manier te leren en hier toevoegen. Zie het Help-" -"onderwerp over <a href=\"bridges.html#finding\">het vinden van bridge " -"relais</a> voor meer informatie over hoe u nieuwe bridge relais-adressen en " -"vingerafdrukken te leren." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/ru/config.po b/ru/config.po index f5d5604..d253e25 100644 --- a/ru/config.po +++ b/ru/config.po @@ -170,24 +170,11 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Даже если вы не знаете ни одного адреса ретранслятора типа мост установка " -"данного флажка может оказаться полезной.Tor шифрует директорию запросов " -",которую может повредить механизм блокировки пытаясь фильтровать Tor запросы" -" об информации о других ретрансляторах.Если соединения обычного Tor " -"ретранслятора так же блокируются,вам нужно изучить каким образом добавлять " -"адрес ретранслятора типа мост.Просмотрите справку на <a " -"href=\"bridges.html#finding\">найти ретрансляторы типа мост</a> для " -"получения дополнительной информации о том, как узнать новый адреса " -"ретранслятора типа мост и отпечатков пальцев." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/templates/config.pot b/templates/config.pot index c9ff834..715a543 100644 --- a/templates/config.pot +++ b/templates/config.pot @@ -169,23 +169,15 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." #. type: Content of: <html><body> #: en/config.html:100 diff --git a/tr/config.po b/tr/config.po index 2b8d22d..cdd1e21 100644 --- a/tr/config.po +++ b/tr/config.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 16:58+0200\n" -"PO-Revision-Date: 2011-04-12 15:33+0000\n" +"PO-Revision-Date: 2011-12-25 09:01+0000\n" "Last-Translator: runasand <runa.sandvik(a)gmail.com>\n" "Language-Team: LANGUAGE <LL(a)li.org>\n" "MIME-Version: 1.0\n" @@ -136,14 +136,10 @@ msgstr "128.213.48.13:8080 105413B1DBDAF867B22674D252DF3D9FA3671F73" #. type: Content of: <html><body><ul><li> #: en/config.html:89 msgid "" -"Even if you do not know any bridge relay addresses, checking this checkbox " -"may still be helpful. Tor will encrypt its directory requests, which can " -"defeat blocking mechanisms that try to filter Tor's requests for information" -" about other relays. If connections to normal Tor relays are also blocked, " -"then you will need to learn a bridge relay address somehow and add it here. " -"See the help topic on <a href=\"bridges.html#finding\">finding bridge " -"relays</a> for more information on how to learn new bridge relay addresses " -"and fingerprints." +"If connections to normal Tor relays are blocked, then you will need to learn" +" a bridge relay address somehow and add it here. See the help topic on <a " +"href=\"bridges.html#finding\">finding bridge relays</a> for more information" +" on how to learn new bridge relay addresses and fingerprints." msgstr "" #. type: Content of: <html><body>

1 0