March 2012 - tor-commits - lists.torproject.org

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 07 Mar '12

07 Mar '12

commit fb2aa32e68609f846726423c095c1bd0fd3aea24 Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 02:45:32 2012 +0000 Update translations for torcheck_completed --- pt_BR/torcheck.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/torcheck.po b/pt_BR/torcheck.po index cecf18c..cc33800 100644 --- a/pt_BR/torcheck.po +++ b/pt_BR/torcheck.po @@ -4,13 +4,14 @@ # Translators: # <flavioamieiro(a)gmail.com>, 2012. # <gmsalomao2(a)gmail.com>, 2011. +# n3t0 <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-03-06 19:53+0000\n" -"Last-Translator: flavioamieiro <flavioamieiro(a)gmail.com>\n" +"PO-Revision-Date: 2012-03-07 02:44+0000\n" +"Last-Translator: n3t0 <>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "Existe um atualização de segurança disponível para o seu Tor Browser msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Click aqui para ir à página de download</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Clique aqui para ir à página de download</a>" msgid "Sorry. You are not using Tor." msgstr "Desculpe. Você não está usando Tor."

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 07 Mar '12

07 Mar '12

commit d75384938d195ad2fa5e46056b302dc966e3bafb Author: Translation commit bot <translation(a)torproject.org> Date: Wed Mar 7 02:45:28 2012 +0000 Update translations for torcheck --- pt_BR/torcheck.po | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/pt_BR/torcheck.po b/pt_BR/torcheck.po index cecf18c..cc33800 100644 --- a/pt_BR/torcheck.po +++ b/pt_BR/torcheck.po @@ -4,13 +4,14 @@ # Translators: # <flavioamieiro(a)gmail.com>, 2012. # <gmsalomao2(a)gmail.com>, 2011. +# n3t0 <>, 2012. msgid "" msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-03-06 19:53+0000\n" -"Last-Translator: flavioamieiro <flavioamieiro(a)gmail.com>\n" +"PO-Revision-Date: 2012-03-07 02:44+0000\n" +"Last-Translator: n3t0 <>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -34,7 +35,7 @@ msgstr "Existe um atualização de segurança disponível para o seu Tor Browser msgid "" "<a href=\"https://www.torproject.org/download/download-easy.html\">Click " "here to go to the download page</a>" -msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Click aqui para ir à página de download</a>" +msgstr "<a href=\"https://www.torproject.org/download/download-easy.html\">Clique aqui para ir à página de download</a>" msgid "Sorry. You are not using Tor." msgstr "Desculpe. Você não está usando Tor."

1 0

[bridgedb/master] change linus's ivp6 address, and also avoid ^bridge
by arma＠torproject.org 06 Mar '12

06 Mar '12

commit 08abccfc21f56df189cfc00d1bcc73aa94c88e0c Author: Roger Dingledine <arma(a)torproject.org> Date: Tue Mar 6 17:40:54 2012 -0500 change linus's ivp6 address, and also avoid ^bridge the theory is that the bots that are scraping bridgedb were scraping his ipv6 bridge too, since they look for ^bridge --- lib/bridgedb/Server.py | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lib/bridgedb/Server.py b/lib/bridgedb/Server.py index 49c39c2..57f49a1 100644 --- a/lib/bridgedb/Server.py +++ b/lib/bridgedb/Server.py @@ -185,7 +185,7 @@ class WebResource(twisted.web.resource.Resource): + "" + t.gettext(I18n.BRIDGEDB_TEXT[3]) + "" \ + "" + t.gettext(I18n.BRIDGEDB_TEXT[4]) + "" \ + email_domain_list \ - + "<hr />Note for experts: if you can use IPv6, try upgrading to Tor 0.2.3.12-alpha and use this bridge line: <tt>bridge [2001:948:7:2::163]:6001</tt> Let us know how it goes!" \ + + "<hr />Note for experts: if you can use IPv6, try upgrading to Tor 0.2.3.12-alpha and use this IPv6 address in your bridge line: <tt>[2001:948:7:2::164]:6001</tt> Let us know how it goes!" \ + "</body></html>" return html_msg

1 0

[translation/torcheck_completed] Update translations for torcheck_completed
by translation＠torproject.org 06 Mar '12

06 Mar '12

commit 160c63526d532f5923d63d10527f12820b12737d Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 6 20:15:27 2012 +0000 Update translations for torcheck_completed --- pt_BR/torcheck.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torcheck.po b/pt_BR/torcheck.po index c615e40..cecf18c 100644 --- a/pt_BR/torcheck.po +++ b/pt_BR/torcheck.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-02-18 15:39+0000\n" +"PO-Revision-Date: 2012-03-06 19:53+0000\n" "Last-Translator: flavioamieiro <flavioamieiro(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" @@ -55,4 +55,4 @@ msgid "" msgstr "Uma falha temporária no serviço nos impede de determinar se o seu endereço IP de origem é um nó da rede <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "O seu endereço IP parece estar: " +msgstr "O seu endereço IP parece ser: "

1 0

[translation/torcheck] Update translations for torcheck
by translation＠torproject.org 06 Mar '12

06 Mar '12

commit 7420891ea59de007732acc61102f39e967177116 Author: Translation commit bot <translation(a)torproject.org> Date: Tue Mar 6 20:15:25 2012 +0000 Update translations for torcheck --- pt_BR/torcheck.po | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pt_BR/torcheck.po b/pt_BR/torcheck.po index c615e40..cecf18c 100644 --- a/pt_BR/torcheck.po +++ b/pt_BR/torcheck.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: The Tor Project\n" "Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2012-02-16 20:28+PDT\n" -"PO-Revision-Date: 2012-02-18 15:39+0000\n" +"PO-Revision-Date: 2012-03-06 19:53+0000\n" "Last-Translator: flavioamieiro <flavioamieiro(a)gmail.com>\n" "Language-Team: Tor Translation <tor-translation(a)torproject.org>\n" "MIME-Version: 1.0\n" @@ -55,4 +55,4 @@ msgid "" msgstr "Uma falha temporária no serviço nos impede de determinar se o seu endereço IP de origem é um nó da rede <a href=\"https://www.torproject.org/\">Tor</a>." msgid "Your IP address appears to be: " -msgstr "O seu endereço IP parece estar: " +msgstr "O seu endereço IP parece ser: "

1 0

[vidalia/master] Handle bootstrap like before and display what tor says if unknown
by chiiph＠torproject.org 06 Mar '12

06 Mar '12

commit 1f0d99388380cad1d9ba3fc144ff19a572fc7475 Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Mar 6 15:54:28 2012 -0300 Handle bootstrap like before and display what tor says if unknown This way we can partially translate the descriptions Conflicts: src/vidalia/MainWindow.cpp --- src/torcontrol/BootstrapStatus.cpp | 39 ++++++++++++++++++++++++++++++++--- src/torcontrol/BootstrapStatus.h | 25 ++++++++++++++++++++-- src/torcontrol/TorControl.cpp | 4 +- src/torcontrol/TorEvents.cpp | 2 +- src/vidalia/MainWindow.cpp | 38 ++++++++++++++++++++++++++++++++++- 5 files changed, 97 insertions(+), 11 deletions(-) diff --git a/src/torcontrol/BootstrapStatus.cpp b/src/torcontrol/BootstrapStatus.cpp index f4e38b8..fb79eb9 100644 --- a/src/torcontrol/BootstrapStatus.cpp +++ b/src/torcontrol/BootstrapStatus.cpp @@ -20,14 +20,13 @@ BootstrapStatus::BootstrapStatus() { _severity = tc::UnrecognizedSeverity; _reason = tc::UnrecognizedReason; - _status = QString(); + _status = UnrecognizedStatus; _action = UnrecognizedRecommendation; _percentComplete = -1; } /** Constructor. */ -BootstrapStatus::BootstrapStatus(tc::Severity severity, - const QString &status, +BootstrapStatus::BootstrapStatus(tc::Severity severity, Status status, int percentComplete, const QString &description, const QString &warning, @@ -43,6 +42,37 @@ BootstrapStatus::BootstrapStatus(tc::Severity severity, _action = action; } +/** Converts a string TAG value to a BootstrapStatus enum value. */ +BootstrapStatus::Status +BootstrapStatus::statusFromString(const QString &str) +{ + if (!str.compare("CONN_DIR", Qt::CaseInsensitive)) + return ConnectingToDirMirror; + if (!str.compare("HANDSHAKE_DIR", Qt::CaseInsensitive)) + return HandshakingWithDirMirror; + if (!str.compare("ONEHOP_CREATE", Qt::CaseInsensitive)) + return CreatingOneHopCircuit; + if (!str.compare("REQUESTING_STATUS", Qt::CaseInsensitive)) + return RequestingNetworkStatus; + if (!str.compare("LOADING_STATUS", Qt::CaseInsensitive)) + return LoadingNetworkStatus; + if (!str.compare("LOADING_KEYS", Qt::CaseInsensitive)) + return LoadingAuthorityCertificates; + if (!str.compare("REQUESTING_DESCRIPTORS", Qt::CaseInsensitive)) + return RequestingDescriptors; + if (!str.compare("LOADING_DESCRIPTORS", Qt::CaseInsensitive)) + return LoadingDescriptors; + if (!str.compare("CONN_OR", Qt::CaseInsensitive)) + return ConnectingToEntryGuard; + if (!str.compare("HANDSHAKE_OR", Qt::CaseInsensitive)) + return HandshakingWithEntryGuard; + if (!str.compare("CIRCUIT_CREATE", Qt::CaseInsensitive)) + return EstablishingCircuit; + if (!str.compare("DONE", Qt::CaseInsensitive)) + return BootstrappingDone; + return UnrecognizedStatus; +} + /** Returns the action that the Tor software recommended be taken in response * to this bootstrap status. */ BootstrapStatus::Recommendation @@ -60,6 +90,7 @@ bool BootstrapStatus::isValid() const { return (_severity != tc::UnrecognizedSeverity - && _percentComplete >= 0); + && _status != UnrecognizedStatus + && _percentComplete >= 0); } diff --git a/src/torcontrol/BootstrapStatus.h b/src/torcontrol/BootstrapStatus.h index a2e3297..7526fdb 100644 --- a/src/torcontrol/BootstrapStatus.h +++ b/src/torcontrol/BootstrapStatus.h @@ -25,6 +25,23 @@ class BootstrapStatus { public: + /** Currently enumerated bootstrapping states defined by Tor's control + * protocol (Tor >= 0.2.1.0-alpha-dev. */ + enum Status { + UnrecognizedStatus, + ConnectingToDirMirror, + HandshakingWithDirMirror, + CreatingOneHopCircuit, + RequestingNetworkStatus, + LoadingNetworkStatus, + LoadingAuthorityCertificates, + RequestingDescriptors, + LoadingDescriptors, + ConnectingToEntryGuard, + HandshakingWithEntryGuard, + EstablishingCircuit, + BootstrappingDone + }; /** Actions the Tor software might recommend controllers take in response to * a bootstrap status problem event. */ enum Recommendation { @@ -38,7 +55,7 @@ public: /** Constructor. */ BootstrapStatus(tc::Severity severity, - const QString &status, int percentComplete, + Status status, int percentComplete, const QString &description, const QString &warning = QString(), tc::ConnectionStatusReason reason = tc::UnrecognizedReason, @@ -49,7 +66,7 @@ public: /** Returns the BootstrapStatus enum value indicated by this bootstrap * status event. */ - QString status() const { return _status; } + Status status() const { return _status; } /** Returns an integer between 0 and 100 representing an estimate of how * much of Tor's bootstrapping process it has completed. */ @@ -77,6 +94,8 @@ public: * phase. */ bool isValid() const; + /** Converts a string TAG value to a BootstrapStatus enum value. */ + static Status statusFromString(const QString &tag); /** Converts a string RECOMMENDATION value to a RecommendAction enum * value. */ static Recommendation actionFromString(const QString &str); @@ -90,7 +109,7 @@ private: /** Current bootstrapping status value. * \sa status */ - QString _status; + Status _status; /** Approximate percentage of Tor's bootstrapping process that is complete. * \sa percentComplete diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index f87f3a9..57785e0 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -230,7 +230,7 @@ TorControl::getBootstrapPhase() tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); BootstrapStatus status = BootstrapStatus(severity, - args.value("TAG"), + BootstrapStatus::statusFromString(args.value("TAG")), args.value("PROGRESS").toInt(), args.value("SUMMARY")); emit bootstrapStatusChanged(status); @@ -403,7 +403,7 @@ TorControl::bootstrapStatus(QString *errmsg) tc::Severity severity = tc::severityFromString(str.section(' ', 0, 0)); QHash<QString,QString> args = string_parse_keyvals(str); return BootstrapStatus(severity, - args.value("TAG"), + BootstrapStatus::statusFromString(args.value("TAG")), args.value("PROGRESS").toInt(), args.value("SUMMARY"), args.value("WARNING"), diff --git a/src/torcontrol/TorEvents.cpp b/src/torcontrol/TorEvents.cpp index f068f1a..588a093 100644 --- a/src/torcontrol/TorEvents.cpp +++ b/src/torcontrol/TorEvents.cpp @@ -368,7 +368,7 @@ TorEvents::handleClientStatusEvent(tc::Severity severity, } else if (! action.compare("BOOTSTRAP", Qt::CaseInsensitive)) { BootstrapStatus status = BootstrapStatus(severity, - args.value("TAG"), + BootstrapStatus::statusFromString(args.value("TAG")), args.value("PROGRESS").toInt(), args.value("SUMMARY"), args.value("WARNING"), diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 166b472..a23478e 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -804,7 +804,43 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs) bs.recommendedAction() != BootstrapStatus::RecommendIgnore); QString description; - description = bs.description(); + switch (bs.status()) { + case BootstrapStatus::ConnectingToDirMirror: + description = tr("Connecting to a relay directory"); + break; + case BootstrapStatus::HandshakingWithDirMirror: + case BootstrapStatus::CreatingOneHopCircuit: + description = tr("Establishing an encrypted directory connection"); + break; + case BootstrapStatus::RequestingNetworkStatus: + description = tr("Retrieving network status"); + break; + case BootstrapStatus::LoadingNetworkStatus: + description = tr("Loading network status"); + break; + case BootstrapStatus::LoadingAuthorityCertificates: + description = tr("Loading authority certificates"); + break; + case BootstrapStatus::RequestingDescriptors: + description = tr("Requesting relay information"); + break; + case BootstrapStatus::LoadingDescriptors: + description = tr("Loading relay information"); + break; + case BootstrapStatus::ConnectingToEntryGuard: + description = tr("Connecting to the Tor network"); + break; + case BootstrapStatus::HandshakingWithEntryGuard: + case BootstrapStatus::EstablishingCircuit: + description = tr("Establishing a Tor circuit"); + break; + case BootstrapStatus::BootstrappingDone: + description = tr("Connected to the Tor network!"); + warn = false; /* probably false anyway */ + break; + default: + description = bs.description(); + } if (warn) { QString reason; /* Is it really a good idea to translate these? */

1 0

[vidalia/alpha] Fix double assignment
by chiiph＠torproject.org 06 Mar '12

06 Mar '12

commit 16cbae9f1a70c327604b29069fc1a71e121c988f Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Mar 6 15:59:24 2012 -0300 Fix double assignment --- src/vidalia/MainWindow.cpp | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index aad830e..c5e4094 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1132,7 +1132,7 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs) warn = false; /* probably false anyway */ break; default: - description = description = bs.description(); + description = bs.description(); } if (warn) { QString reason;

1 0

[vidalia/alpha] Handle bootstrap like before and display what tor says if unknown
by chiiph＠torproject.org 06 Mar '12

06 Mar '12

commit aa75d978cf5f442acc1221b58320191c50affafd Author: Tomás Touceda <chiiph(a)torproject.org> Date: Tue Mar 6 15:54:28 2012 -0300 Handle bootstrap like before and display what tor says if unknown This way we can partially translate the descriptions --- src/torcontrol/BootstrapStatus.cpp | 39 ++++++++++++++++++++++++++++++++--- src/torcontrol/BootstrapStatus.h | 25 ++++++++++++++++++++-- src/torcontrol/TorControl.cpp | 4 +- src/torcontrol/TorEvents.cpp | 2 +- src/vidalia/MainWindow.cpp | 38 ++++++++++++++++++++++++++++++++++- 5 files changed, 97 insertions(+), 11 deletions(-) diff --git a/src/torcontrol/BootstrapStatus.cpp b/src/torcontrol/BootstrapStatus.cpp index f4e38b8..fb79eb9 100644 --- a/src/torcontrol/BootstrapStatus.cpp +++ b/src/torcontrol/BootstrapStatus.cpp @@ -20,14 +20,13 @@ BootstrapStatus::BootstrapStatus() { _severity = tc::UnrecognizedSeverity; _reason = tc::UnrecognizedReason; - _status = QString(); + _status = UnrecognizedStatus; _action = UnrecognizedRecommendation; _percentComplete = -1; } /** Constructor. */ -BootstrapStatus::BootstrapStatus(tc::Severity severity, - const QString &status, +BootstrapStatus::BootstrapStatus(tc::Severity severity, Status status, int percentComplete, const QString &description, const QString &warning, @@ -43,6 +42,37 @@ BootstrapStatus::BootstrapStatus(tc::Severity severity, _action = action; } +/** Converts a string TAG value to a BootstrapStatus enum value. */ +BootstrapStatus::Status +BootstrapStatus::statusFromString(const QString &str) +{ + if (!str.compare("CONN_DIR", Qt::CaseInsensitive)) + return ConnectingToDirMirror; + if (!str.compare("HANDSHAKE_DIR", Qt::CaseInsensitive)) + return HandshakingWithDirMirror; + if (!str.compare("ONEHOP_CREATE", Qt::CaseInsensitive)) + return CreatingOneHopCircuit; + if (!str.compare("REQUESTING_STATUS", Qt::CaseInsensitive)) + return RequestingNetworkStatus; + if (!str.compare("LOADING_STATUS", Qt::CaseInsensitive)) + return LoadingNetworkStatus; + if (!str.compare("LOADING_KEYS", Qt::CaseInsensitive)) + return LoadingAuthorityCertificates; + if (!str.compare("REQUESTING_DESCRIPTORS", Qt::CaseInsensitive)) + return RequestingDescriptors; + if (!str.compare("LOADING_DESCRIPTORS", Qt::CaseInsensitive)) + return LoadingDescriptors; + if (!str.compare("CONN_OR", Qt::CaseInsensitive)) + return ConnectingToEntryGuard; + if (!str.compare("HANDSHAKE_OR", Qt::CaseInsensitive)) + return HandshakingWithEntryGuard; + if (!str.compare("CIRCUIT_CREATE", Qt::CaseInsensitive)) + return EstablishingCircuit; + if (!str.compare("DONE", Qt::CaseInsensitive)) + return BootstrappingDone; + return UnrecognizedStatus; +} + /** Returns the action that the Tor software recommended be taken in response * to this bootstrap status. */ BootstrapStatus::Recommendation @@ -60,6 +90,7 @@ bool BootstrapStatus::isValid() const { return (_severity != tc::UnrecognizedSeverity - && _percentComplete >= 0); + && _status != UnrecognizedStatus + && _percentComplete >= 0); } diff --git a/src/torcontrol/BootstrapStatus.h b/src/torcontrol/BootstrapStatus.h index a2e3297..7526fdb 100644 --- a/src/torcontrol/BootstrapStatus.h +++ b/src/torcontrol/BootstrapStatus.h @@ -25,6 +25,23 @@ class BootstrapStatus { public: + /** Currently enumerated bootstrapping states defined by Tor's control + * protocol (Tor >= 0.2.1.0-alpha-dev. */ + enum Status { + UnrecognizedStatus, + ConnectingToDirMirror, + HandshakingWithDirMirror, + CreatingOneHopCircuit, + RequestingNetworkStatus, + LoadingNetworkStatus, + LoadingAuthorityCertificates, + RequestingDescriptors, + LoadingDescriptors, + ConnectingToEntryGuard, + HandshakingWithEntryGuard, + EstablishingCircuit, + BootstrappingDone + }; /** Actions the Tor software might recommend controllers take in response to * a bootstrap status problem event. */ enum Recommendation { @@ -38,7 +55,7 @@ public: /** Constructor. */ BootstrapStatus(tc::Severity severity, - const QString &status, int percentComplete, + Status status, int percentComplete, const QString &description, const QString &warning = QString(), tc::ConnectionStatusReason reason = tc::UnrecognizedReason, @@ -49,7 +66,7 @@ public: /** Returns the BootstrapStatus enum value indicated by this bootstrap * status event. */ - QString status() const { return _status; } + Status status() const { return _status; } /** Returns an integer between 0 and 100 representing an estimate of how * much of Tor's bootstrapping process it has completed. */ @@ -77,6 +94,8 @@ public: * phase. */ bool isValid() const; + /** Converts a string TAG value to a BootstrapStatus enum value. */ + static Status statusFromString(const QString &tag); /** Converts a string RECOMMENDATION value to a RecommendAction enum * value. */ static Recommendation actionFromString(const QString &str); @@ -90,7 +109,7 @@ private: /** Current bootstrapping status value. * \sa status */ - QString _status; + Status _status; /** Approximate percentage of Tor's bootstrapping process that is complete. * \sa percentComplete diff --git a/src/torcontrol/TorControl.cpp b/src/torcontrol/TorControl.cpp index dc4bf1d..9cdf6ad 100644 --- a/src/torcontrol/TorControl.cpp +++ b/src/torcontrol/TorControl.cpp @@ -238,7 +238,7 @@ TorControl::getBootstrapPhase() tc::Severity severity = tc::severityFromString(args.value("status/bootstrap-phase")); BootstrapStatus status = BootstrapStatus(severity, - args.value("TAG"), + BootstrapStatus::statusFromString(args.value("TAG")), args.value("PROGRESS").toInt(), args.value("SUMMARY")); emit bootstrapStatusChanged(status); @@ -411,7 +411,7 @@ TorControl::bootstrapStatus(QString *errmsg) tc::Severity severity = tc::severityFromString(str.section(' ', 0, 0)); QHash<QString,QString> args = string_parse_keyvals(str); return BootstrapStatus(severity, - args.value("TAG"), + BootstrapStatus::statusFromString(args.value("TAG")), args.value("PROGRESS").toInt(), args.value("SUMMARY"), args.value("WARNING"), diff --git a/src/torcontrol/TorEvents.cpp b/src/torcontrol/TorEvents.cpp index f068f1a..588a093 100644 --- a/src/torcontrol/TorEvents.cpp +++ b/src/torcontrol/TorEvents.cpp @@ -368,7 +368,7 @@ TorEvents::handleClientStatusEvent(tc::Severity severity, } else if (! action.compare("BOOTSTRAP", Qt::CaseInsensitive)) { BootstrapStatus status = BootstrapStatus(severity, - args.value("TAG"), + BootstrapStatus::statusFromString(args.value("TAG")), args.value("PROGRESS").toInt(), args.value("SUMMARY"), args.value("WARNING"), diff --git a/src/vidalia/MainWindow.cpp b/src/vidalia/MainWindow.cpp index 732ca26..aad830e 100644 --- a/src/vidalia/MainWindow.cpp +++ b/src/vidalia/MainWindow.cpp @@ -1097,7 +1097,43 @@ MainWindow::bootstrapStatusChanged(const BootstrapStatus &bs) bs.recommendedAction() != BootstrapStatus::RecommendIgnore); QString description; - description = bs.description(); + switch (bs.status()) { + case BootstrapStatus::ConnectingToDirMirror: + description = tr("Connecting to a relay directory"); + break; + case BootstrapStatus::HandshakingWithDirMirror: + case BootstrapStatus::CreatingOneHopCircuit: + description = tr("Establishing an encrypted directory connection"); + break; + case BootstrapStatus::RequestingNetworkStatus: + description = tr("Retrieving network status"); + break; + case BootstrapStatus::LoadingNetworkStatus: + description = tr("Loading network status"); + break; + case BootstrapStatus::LoadingAuthorityCertificates: + description = tr("Loading authority certificates"); + break; + case BootstrapStatus::RequestingDescriptors: + description = tr("Requesting relay information"); + break; + case BootstrapStatus::LoadingDescriptors: + description = tr("Loading relay information"); + break; + case BootstrapStatus::ConnectingToEntryGuard: + description = tr("Connecting to the Tor network"); + break; + case BootstrapStatus::HandshakingWithEntryGuard: + case BootstrapStatus::EstablishingCircuit: + description = tr("Establishing a Tor circuit"); + break; + case BootstrapStatus::BootstrappingDone: + description = tr("Connected to the Tor network!"); + warn = false; /* probably false anyway */ + break; + default: + description = description = bs.description(); + } if (warn) { QString reason; /* Is it really a good idea to translate these? */

1 0

[obfsproxy/master] Fix building doxygen outside the source tree
by asn＠torproject.org 06 Mar '12

06 Mar '12

commit 561f3419d5fc3e421c13b87bff2f19cdd79216a7 Author: Peter Palfrader <peter(a)palfrader.org> Date: Mon Mar 5 22:17:58 2012 +0100 Fix building doxygen outside the source tree --- Makefile.am | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/Makefile.am b/Makefile.am index 002df7a..4dba0a1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -77,7 +77,9 @@ EXTRA_DIST = \ TESTS = unittests doxygen: - doxygen && cd doc/doxygen/latex && make + mkdir -p doc/doxygen + doxygen $(top_srcdir)/Doxyfile + $(MAKE) -C doc/doxygen/latex if HAVE_PYTHON TESTS += tester.py

1 0

[obfsproxy/master] Update changelog for #5315.
by asn＠torproject.org 06 Mar '12

06 Mar '12

commit ed5840e6477ce3e1688e61ee760bab43e4fde761 Author: George Kadianakis <desnacked(a)riseup.net> Date: Tue Mar 6 10:39:42 2012 -0800 Update changelog for #5315. --- ChangeLog | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index 93a9bff..17feada 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,9 +1,10 @@ Changes in version 0.1.1 - <not yet released> - Add trailing slash to the torproject URL in the man page. Fixes bug #5311. Patch by Peter Palfrader. - - Add LICENSE and Doxyfile to the release archives from now on. Fixes bug #5312. Patch by Peter Palfrader. + - Allow doxygen documentation to be built in out-of-source + builds. Fixes bug #5315. Patch by Peter Palfrader. Changes in version 0.1.0 - 2012-03-05

1 0