October 2011 - tor-commits - lists.torproject.org

[vidalia/master] Compute max with only the visible points in bwgraph
by chiiph＠torproject.org 07 Oct '11

07 Oct '11

commit a08aa988a29ffa4d6db93250fe7589cd61395e09 Author: Tomas Touceda <chiiph(a)gentoo.org> Date: Sat May 21 14:43:41 2011 -0300 Compute max with only the visible points in bwgraph If the max is global instead of local, a peak in the connection will make the rest of the graph too small. --- src/vidalia/bwgraph/GraphFrame.cpp | 45 ++++++++++++++++++++++++++++++----- src/vidalia/bwgraph/GraphFrame.h | 4 +++ 2 files changed, 42 insertions(+), 7 deletions(-) diff --git a/src/vidalia/bwgraph/GraphFrame.cpp b/src/vidalia/bwgraph/GraphFrame.cpp index c9537a0..c5d3f60 100644 --- a/src/vidalia/bwgraph/GraphFrame.cpp +++ b/src/vidalia/bwgraph/GraphFrame.cpp @@ -15,7 +15,7 @@ #include "GraphFrame.h" -#include <QtGlobal> +#include <QtGui> /** Default contructor */ @@ -31,7 +31,8 @@ GraphFrame::GraphFrame(QWidget *parent) /* Initialize graph values */ _recvData->prepend(0); _sendData->prepend(0); - _maxPoints = getNumPoints(); + _maxPoints = getNumPoints(); + _maxPosition = 0; _showRecv = true; _showSend = true; _maxValue = MIN_SCALE; @@ -51,9 +52,7 @@ GraphFrame::~GraphFrame() int GraphFrame::getNumPoints() { - QDesktopWidget *desktop = QApplication::desktop(); - int width = desktop->width(); - return width; + return size().width() - _scaleWidth; } /** Adds new data points to the graph. */ @@ -66,6 +65,18 @@ GraphFrame::addPoints(qreal recv, qreal send) _recvData->removeLast(); } + /* Update the displayed maximum */ + if (_maxPosition >= _maxPoints) { + _maxValue = MIN_SCALE; + foreach(qreal send, *_sendData) + if(send > _maxValue) + _maxValue = send; + foreach(qreal recv, *_recvData) + if(recv > _maxValue) + _maxValue = recv; + _maxPosition = 0; + } + /* Add the points to their respective lists */ _sendData->prepend(send); _recvData->prepend(recv); @@ -74,9 +85,23 @@ GraphFrame::addPoints(qreal recv, qreal send) _totalSend += send; _totalRecv += recv; + bool maxUpdated = false; /* Check for a new maximum value */ - if (send > _maxValue) _maxValue = send; - if (recv > _maxValue) _maxValue = recv; + if (send > _maxValue) { + _maxValue = send; + maxUpdated = true; + } + + if (recv > _maxValue) { + _maxValue = recv; + maxUpdated = true; + } + + if (maxUpdated) { + _maxPosition = 0; + } else { + _maxPosition++; + } this->update(); } @@ -318,3 +343,9 @@ GraphFrame::paintScale() _painter->drawLine(_scaleWidth, top, _scaleWidth, bottom); } +void +GraphFrame::resizeEvent(QResizeEvent *ev) +{ + _maxPoints = ev->size().width() - _scaleWidth; + _maxPoints /= SCROLL_STEP; +} diff --git a/src/vidalia/bwgraph/GraphFrame.h b/src/vidalia/bwgraph/GraphFrame.h index 4819396..8e29cc2 100644 --- a/src/vidalia/bwgraph/GraphFrame.h +++ b/src/vidalia/bwgraph/GraphFrame.h @@ -89,6 +89,8 @@ private: /** Paints an integral using the supplied data. */ void paintIntegral(QVector<QPointF> points, QColor color, qreal alpha = 1.0); + void resizeEvent(QResizeEvent *ev); + /** Style with which the bandwidth data will be graphed. */ GraphStyle _graphStyle; /** A QPainter object that handles drawing the various graph elements. */ @@ -101,6 +103,8 @@ private: QRect _rec; /** The maximum data value plotted. */ qreal _maxValue; + /** The position of the local maximum in the displayed bandwidth */ + int _maxPosition; /** The maximum number of points to store. */ int _maxPoints; /** The total data sent/recv. */

1 0

[translation/vidalia_installer] Update translations for vidalia_installer
by translation＠torproject.org 07 Oct '11

07 Oct '11

commit 7c93a54c436ef74578560ff53b9c17d251738b72 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 7 18:34:26 2011 +0000 Update translations for vidalia_installer --- templates/vidalia.pot | 195 ++++++++++++++++++++++++++++++++---------------- 1 files changed, 130 insertions(+), 65 deletions(-) diff --git a/templates/vidalia.pot b/templates/vidalia.pot index 3662bd4..741c0ed 100644 --- a/templates/vidalia.pot +++ b/templates/vidalia.pot @@ -1,217 +1,282 @@ +# +# Translators: +# runasand <runa.sandvik(a)gmail.com>, 2011. msgid "" msgstr "" -"Project-Id-Version: Vidalia Windows Installers\n" -"Report-Msgid-Bugs-To: translations(a)vidalia-project.net\n" +"Project-Id-Version: The Tor Project\n" +"Report-Msgid-Bugs-To: https://trac.torproject.org/projects/tor\n" "POT-Creation-Date: 2008-07-12 05:29+0000\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" +"PO-Revision-Date: 2010-12-05 20:21+0000\n" "Last-Translator: \n" "Language-Team: translations(a)vidalia-project.net\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"Plural-Forms: nplurals=4; plural=(n%100==1 ? 0 : n%100==2 ? 1 : n%100==3 || n" -"%100==4 ? 2 : 3);\n" +"Language: en\n" +"Plural-Forms: nplurals=2; plural=(n != 1)\n" msgctxt "BundleSetupCaption" msgid "${BUNDLE_NAME} setup" -msgstr "" +msgstr "${BUNDLE_NAME} setup" msgctxt "BundleWelcomeText" msgid "" -"This wizard will guide you through the installation of Tor, " -"Vidalia, Polipo, and Torbutton.\n\nTor is a system for using the " -"Internet anonymously, helping you anonymize Web browsing and publishing, " -"instant messaging, IRC, and more. Vidalia is a GUI that helps you " -"control, monitor, and configure Tor.\n\nPolipo is a caching web proxy " -"that helps increase performance of browsing the web through " -"Tor.\n\nTorbutton is a Firefox extension that allows you to quickly " -"enable or disable anonymous web browsing.\n\nIf you have previously " -"installed Tor, Vidalia, Polipo, or Firefox, please make sure they are " -"not running before continuing this installation.\n\n$_CLICK" -msgstr "" +"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n" +"\n" +"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n" +"\n" +"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n" +"\n" +"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n" +"\n" +"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n" +"\n" +"$_CLICK" +msgstr "" +"This wizard will guide you through the installation of Tor, Vidalia, Polipo, and Torbutton.\n" +"\n" +"Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more. Vidalia is a GUI that helps you control, monitor, and configure Tor.\n" +"\n" +"Polipo is a caching web proxy that helps increase performance of browsing the web through Tor.\n" +"\n" +"Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing.\n" +"\n" +"If you have previously installed Tor, Vidalia, Polipo, or Firefox, please make sure they are not running before continuing this installation.\n" +"\n" +"$_CLICK" msgctxt "BundleWelcomeTitle" msgid "Welcome to the ${BUNDLE_NAME} Setup Wizard" -msgstr "" +msgstr "Welcome to the ${BUNDLE_NAME} Setup Wizard" msgctxt "BundleLinkText" msgid "${TOR_NAME} installation documentation" -msgstr "" +msgstr "${TOR_NAME} installation documentation" msgctxt "BundleFinishText" -msgid "Installation is complete.\nPlease see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n\nIf you installed Torbutton, you will need to restart Firefox." +msgid "" +"Installation is complete.\n" +"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n" +"\n" +"If you installed Torbutton, you will need to restart Firefox." msgstr "" +"Installation is complete.\n" +"Please see https://www.torproject.org/docs/tor-doc-windows to learn how to configure your applications to use Tor.\n" +"\n" +"If you installed Torbutton, you will need to restart Firefox." msgctxt "BundleRunNow" msgid "Run installed components now" -msgstr "" +msgstr "Run installed components now" msgctxt "VidaliaGroupDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." -msgstr "" +msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor." msgctxt "VidaliaUninstDesc" msgid "Remove ${VIDALIA_DESC}." -msgstr "" +msgstr "Remove ${VIDALIA_DESC}." msgctxt "VidaliaSetupCaption" msgid "${VIDALIA_NAME} setup" -msgstr "" +msgstr "${VIDALIA_NAME} setup" msgctxt "VidaliaWelcomeText" -msgid "This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n\n$_CLICK" +msgid "" +"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n" +"\n" +"$_CLICK" msgstr "" +"This wizard will guide you through the installation of Vidalia, a GUI that helps you control, monitor, and configure Tor.\n" +"\n" +"$_CLICK" msgctxt "VidaliaWelcomeTitle" msgid "Welcome to the ${VIDALIA_NAME} Setup Wizard" -msgstr "" +msgstr "Welcome to the ${VIDALIA_NAME} Setup Wizard" msgctxt "VidaliaLinkText" msgid "${VIDALIA_NAME} homepage" -msgstr "" +msgstr "${VIDALIA_NAME} homepage" msgctxt "VidaliaAppDesc" msgid "Vidalia is a GUI that helps you control, monitor, and configure Tor." -msgstr "" +msgstr "Vidalia is a GUI that helps you control, monitor, and configure Tor." msgctxt "VidaliaStartup" msgid "Run At Startup" -msgstr "" +msgstr "Run At Startup" msgctxt "VidaliaStartupDesc" msgid "Automatically run ${VIDALIA_NAME} at startup." -msgstr "" +msgstr "Automatically run ${VIDALIA_NAME} at startup." msgctxt "VidaliaShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Add to Start Menu" msgctxt "VidaliaShortcutsDesc" msgid "Add ${VIDALIA_NAME} to your Start menu." -msgstr "" +msgstr "Add ${VIDALIA_NAME} to your Start menu." msgctxt "VidaliaRunNow" msgid "Run ${VIDALIA_NAME}" -msgstr "" +msgstr "Run ${VIDALIA_NAME}" msgctxt "TorGroupDesc" -msgid "Tor is a system for using the Internet anonymously, helping you anonymize Web browsing and publishing, instant messaging, IRC, and more." +msgid "" +"Tor is a system for using the Internet anonymously, helping you anonymize " +"Web browsing and publishing, instant messaging, IRC, and more." msgstr "" +"Tor is a system for using the Internet anonymously, helping you anonymize " +"Web browsing and publishing, instant messaging, IRC, and more." msgctxt "TorUninstDesc" msgid "Remove ${TOR_DESC}." -msgstr "" +msgstr "Remove ${TOR_DESC}." msgctxt "TorAppDesc" msgid "Install ${TOR_DESC}." -msgstr "" +msgstr "Install ${TOR_DESC}." msgctxt "TorAskOverwriteTorrc" -msgid "You already have a Tor configuration file.$\n$\nDo you want to overwrite it with the default sample configuration file?" +msgid "" +"You already have a Tor configuration file.$\n" +"$\n" +"Do you want to overwrite it with the default sample configuration file?" msgstr "" +"You already have a Tor configuration file.$\n" +"$\n" +"Do you want to overwrite it with the default sample configuration file?" msgctxt "TorDocumentation" msgid "Documentation" -msgstr "" +msgstr "Documentation" msgctxt "TorDocumentationDesc" msgid "Install ${TOR_NAME} documentation." -msgstr "" +msgstr "Install ${TOR_NAME} documentation." msgctxt "TorShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Add to Start Menu" msgctxt "TorShortcutsDesc" msgid "Add ${TOR_NAME} to your Start menu." -msgstr "" +msgstr "Add ${TOR_NAME} to your Start menu." msgctxt "PolipoGroupDesc" -msgid "Polipo is a caching web proxy that increases performance of web browsing through Tor." +msgid "" +"Polipo is a caching web proxy that increases performance of web browsing " +"through Tor." msgstr "" +"Polipo is a caching web proxy that increases performance of web browsing " +"through Tor." msgctxt "PolipoUninstDesc" msgid "Remove ${POLIPO_DESC}." -msgstr "" +msgstr "Remove ${POLIPO_DESC}." msgctxt "PolipoAppDesc" msgid "Install ${POLIPO_DESC}." -msgstr "" +msgstr "Install ${POLIPO_DESC}." msgctxt "PolipoShortcuts" msgid "Add to Start Menu" -msgstr "" +msgstr "Add to Start Menu" msgctxt "PolipoShortcutsDesc" msgid "Add ${POLIPO_NAME} to your Start menu." -msgstr "" +msgstr "Add ${POLIPO_NAME} to your Start menu." msgctxt "PolipoStartup" msgid "Run At Startup" -msgstr "" +msgstr "Run At Startup" msgctxt "PolipoStartupDesc" msgid "Automatically run ${POLIPO_NAME} at startup." -msgstr "" +msgstr "Automatically run ${POLIPO_NAME} at startup." msgctxt "TorbuttonGroupDesc" -msgid "Torbutton is a Firefox extension that allows you to quickly enable or disable anonymous web browsing." +msgid "" +"Torbutton is a Firefox extension that allows you to quickly enable or " +"disable anonymous web browsing." msgstr "" +"Torbutton is a Firefox extension that allows you to quickly enable or " +"disable anonymous web browsing." msgctxt "TorbuttonUninstDesc" msgid "Remove ${TORBUTTON_DESC}." -msgstr "" +msgstr "Remove ${TORBUTTON_DESC}." msgctxt "TorbuttonAppDesc" msgid "Install ${TORBUTTON_DESC}." -msgstr "" +msgstr "Install ${TORBUTTON_DESC}." msgctxt "TorbuttonAddToFirefox" msgid "Add to Firefox" -msgstr "" +msgstr "Add to Firefox" msgctxt "TorbuttonAddToFirefoxDesc" msgid "Add the ${TORBUTTON_DESC} extension to Firefox." -msgstr "" +msgstr "Add the ${TORBUTTON_DESC} extension to Firefox." msgctxt "TorbuttonFirefoxNotFound" msgid "Firefox was not found on your system. Not installing Torbutton." -msgstr "" +msgstr "Firefox was not found on your system. Not installing Torbutton." msgctxt "AppData" msgid "Application Data" -msgstr "" +msgstr "Application Data" msgctxt "AppDataUninstDesc" msgid "Remove saved application data and configuration files." -msgstr "" +msgstr "Remove saved application data and configuration files." msgctxt "LanguageCode" msgid "en" -msgstr "" +msgstr "en" msgctxt "FirefoxWarningPageTitle" msgid "Firefox is not installed" -msgstr "" +msgstr "Firefox is not installed" msgctxt "FirefoxWarningPageSubtitle" -msgid "We recommend that you install Firefox before continuing, for best safety." +msgid "" +"We recommend that you install Firefox before continuing, for best safety." msgstr "" +"We recommend that you install Firefox before continuing, for best safety." msgctxt "FirefoxWarningPageUpperText" -msgid "The Mozilla Firefox Web browser is not installed on your computer.\n" +msgid "" +"The Mozilla Firefox Web browser is not installed on your computer.\n" "Tor will work with other browsers, such as Internet Explorer, but\n" "is easier to use with Firefox, which also does a better job of\n" -"protecting your anonymity." -"\n\n" +"protecting your anonymity.\n" +"\n" "If you would like to install Firefox, please press Cancel, then go\n" "to the Firefox download page at" msgstr "" +"The Mozilla Firefox Web browser is not installed on your computer.\n" +"Tor will work with other browsers, such as Internet Explorer, but\n" +"is easier to use with Firefox, which also does a better job of\n" +"protecting your anonymity.\n" +"\n" +"If you would like to install Firefox, please press Cancel, then go\n" +"to the Firefox download page at" msgctxt "FirefoxWarningPageLowerText" -msgid "When you are done installing Firefox, you can once again run the\n" -"Tor installer." -"\n\n" +msgid "" +"When you are done installing Firefox, you can once again run the\n" +"Tor installer.\n" +"\n" "Or, if you would prefer to install Tor without Firefox, simply\n" "press Next to continue." msgstr "" +"When you are done installing Firefox, you can once again run the\n" +"Tor installer.\n" +"\n" +"Or, if you would prefer to install Tor without Firefox, simply\n" +"press Next to continue." + +

1 0

[obfsproxy/master] Merge remote-tracking branch 'asn/bug3437_v2'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 70cb7afcffc3fda3cad8a90325c6cd5b4d519736 Merge: c19ced7 c66f3f5 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 13:17:45 2011 -0400 Merge remote-tracking branch 'asn/bug3437_v2' src/managed.c | 2 ++ src/sha256.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[obfsproxy/master] Make it compile on Windows™.
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit c66f3f58b3740b9380e5cc466eeefb808249c6cd Author: George Kadianakis <desnacked(a)gmail.com> Date: Fri Oct 7 16:00:47 2011 +0200 Make it compile on Windows™. --- src/managed.c | 2 ++ src/sha256.c | 5 ++++- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/src/managed.c b/src/managed.c index 4178b97..99f8290 100644 --- a/src/managed.c +++ b/src/managed.c @@ -15,7 +15,9 @@ #include <event2/event.h> #include <event2/listener.h> +#ifndef _WIN32 #include <arpa/inet.h> /* for inet_ntoa() */ +#endif /** Holds all the parameters provided by tor through environment variables. */ diff --git a/src/sha256.c b/src/sha256.c index fccbde6..a49bf3b 100644 --- a/src/sha256.c +++ b/src/sha256.c @@ -7,7 +7,10 @@ #include "util.h" #include "sha256.h" -#include <arpa/inet.h> /* for htonl/ntohl */ + +#ifndef _WIN32 +#include <arpa/inet.h> /* for inet_ntoa() */ +#endif #define STMT_BEGIN do { #define STMT_END } while (0)

1 0

[arm/master] fix: fixing tor process detection for openbsd
by atagar＠torproject.org 07 Oct '11

07 Oct '11

commit 84cd622e515c97d0c9b0d9779204155978926e9d Author: Damian Johnson <atagar(a)torproject.org> Date: Fri Oct 7 09:18:14 2011 -0700 fix: fixing tor process detection for openbsd OpenBSD uses a different variant of ps causing the tor process detection (among many other things) to fail. Caught thanks to a test system from Jordi Clofent. --- src/util/torTools.py | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/src/util/torTools.py b/src/util/torTools.py index 8e2d6d5..34c9adc 100644 --- a/src/util/torTools.py +++ b/src/util/torTools.py @@ -352,6 +352,19 @@ def isTorRunning(): # suggestions welcome for making this more reliable commandResults = sysTools.call("ps -A co command") + + if not commandResults: + # OpenBSD uses a weird (and largely broken from the looks of it) version of + # ps. It lacks the -A argument and according to the man page -j, -l, and -u + # all do something similar but they fail. + # + # ucomm is defined in the man page as 'Alias: comm. Name to be used for + # accounting.' The alias part is a lie (it works, but with an error + # message), though this seems to do what we want and prints the bare + # command. + + commandResults = sysTools.call("ps -o ucomm=") + if commandResults: for cmd in commandResults: if cmd.strip() == "tor": return True

1 0

[tor/master] Merge remote-tracking branch 'origin/maint-0.2.2'
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 98e5c63eb254cb4b744281b75093c4bd7f73b6c6 Merge: 2725a88 6d027a3 Author: Nick Mathewson <nickm(a)torproject.org> Date: Fri Oct 7 12:20:08 2011 -0400 Merge remote-tracking branch 'origin/maint-0.2.2' changes/bug4201 | 5 +++++ src/or/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-)

1 0

[tor/master] Avoid running DNS self-tests if we're operating as a bridge
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 6d027a3823843030fc24d7224da3ca976f121b01 Author: warms0x <warms0x(a)riseup.net> Date: Fri Oct 7 07:04:29 2011 +0000 Avoid running DNS self-tests if we're operating as a bridge --- changes/bug4201 | 5 +++++ src/or/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4201 b/changes/bug4201 new file mode 100644 index 0000000..6f7d715 --- /dev/null +++ b/changes/bug4201 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Bridges now skip DNS self-tests, to act a little more stealthily. + Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced + bridges. Patch by "warms0x". + diff --git a/src/or/main.c b/src/or/main.c index 289d805..95acea4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1241,7 +1241,7 @@ run_scheduled_events(time_t now) /** 9. and if we're a server, check whether our DNS is telling stories to * us. */ - if (is_server && time_to_check_for_correct_dns < now) { + if (public_server_mode(options) && time_to_check_for_correct_dns < now) { if (!time_to_check_for_correct_dns) { time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120); } else {

1 0

[tor/maint-0.2.2] Avoid running DNS self-tests if we're operating as a bridge
by nickm＠torproject.org 07 Oct '11

07 Oct '11

commit 6d027a3823843030fc24d7224da3ca976f121b01 Author: warms0x <warms0x(a)riseup.net> Date: Fri Oct 7 07:04:29 2011 +0000 Avoid running DNS self-tests if we're operating as a bridge --- changes/bug4201 | 5 +++++ src/or/main.c | 2 +- 2 files changed, 6 insertions(+), 1 deletions(-) diff --git a/changes/bug4201 b/changes/bug4201 new file mode 100644 index 0000000..6f7d715 --- /dev/null +++ b/changes/bug4201 @@ -0,0 +1,5 @@ + o Minor bugfixes: + - Bridges now skip DNS self-tests, to act a little more stealthily. + Fixes bug 4201; bugfix on 0.2.0.3-alpha, which first introduced + bridges. Patch by "warms0x". + diff --git a/src/or/main.c b/src/or/main.c index 289d805..95acea4 100644 --- a/src/or/main.c +++ b/src/or/main.c @@ -1241,7 +1241,7 @@ run_scheduled_events(time_t now) /** 9. and if we're a server, check whether our DNS is telling stories to * us. */ - if (is_server && time_to_check_for_correct_dns < now) { + if (public_server_mode(options) && time_to_check_for_correct_dns < now) { if (!time_to_check_for_correct_dns) { time_to_check_for_correct_dns = now + 60 + crypto_rand_int(120); } else {

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Oct '11

07 Oct '11

commit f1000ba21ad65ce9a824f40af9034f100f9ca676 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 7 13:33:22 2011 +0000 Update translations for vidalia_help --- es/services.po | 22 +++++++++++++++++++++- 1 files changed, 21 insertions(+), 1 deletions(-) diff --git a/es/services.po b/es/services.po index b352994..e2b90d4 100644 --- a/es/services.po +++ b/es/services.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-10-07 12:34+0000\n" +"PO-Revision-Date: 2011-10-07 13:22+0000\n" "Last-Translator: ernestob <ernesto_pow(a)hotmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -139,6 +139,13 @@ msgid "" "display the real onion address, you need to save your configuration and re-" "open the settings window." msgstr "" +"Dirección onion (generada): la dirección del servicio (dirección onion) la " +"genera Tor para identificar únicamente tu servicio. Debes dar esta dirección" +" onion a la gente que desea acceder a tu servicio. Pudes usar el botón " +"\"Copiar al portapapeles\" para evitar introducir errores. Si acabas de " +"crear un servicio oculto, el campo dirá \"[Creado por Tor]\". Para mostrar " +"la dirección onion real, necesitará guardar su configuración y abrir de " +"nuevo la ventana de configuración." #. type: Content of: <html><body><ul><li> #: en/services.html:68 @@ -149,6 +156,12 @@ msgid "" "port usually has nothing to do with firewall settings, because it is only " "used Tor-internally." msgstr "" +"Puerto virtual (obligatorio): este es el puerto TCP que el cliente " +"necesitará conocer para acceder a tu servicio. Aquí se puede utilizar el " +"servicio específico de puertos, como por ejemplo el puerto 80 para HTTP. " +"Tenga en cuenta que el puerto virtual por lo general no tiene nada que ver " +"con la configuración del firewall, ya que sólo lo utiliza Tor de manera " +"interna." #. type: Content of: <html><body><ul><li> #: en/services.html:73 @@ -161,6 +174,13 @@ msgid "" "specify any target, Tor will redirect requests to the port specified in " "\"Virtual Port\" on localhost." msgstr "" +"Destino (opcional): por lo general querrá que Tor realice peticiones de " +"conexión al host local en un puerto diferente al especificado en el \"Puerto" +" virtual\". Para hacerlo, puede especificar un destino basado en un puerto y" +" dirección físicos que se redireccionen a su servicio oculto, por ejemplo a " +"localhost:5222 (o cualquier puerto que su servidor esté escuchando). Si no " +"especifica ningún destino, Tor redireccionará las peticiones al puerto " +"especificado en el host local del \"Puerto virtual\"." #. type: Content of: <html><body><ul><li> #: en/services.html:81

1 0

[translation/vidalia_help] Update translations for vidalia_help
by translation＠torproject.org 07 Oct '11

07 Oct '11

commit 2dc6d7356a2f0d3449875208098606346f0aaf99 Author: Translation commit bot <translation(a)torproject.org> Date: Fri Oct 7 13:02:15 2011 +0000 Update translations for vidalia_help --- es/services.po | 13 ++++++++++--- 1 files changed, 10 insertions(+), 3 deletions(-) diff --git a/es/services.po b/es/services.po index 1132177..b352994 100644 --- a/es/services.po +++ b/es/services.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-10-07 12:24+0000\n" +"PO-Revision-Date: 2011-10-07 12:34+0000\n" "Last-Translator: ernestob <ernesto_pow(a)hotmail.com>\n" "Language-Team: Spanish (Castilian) (http://www.transifex.net/projects/p/torproject/team/es/)\n" "MIME-Version: 1.0\n" @@ -96,6 +96,8 @@ msgid "" "Configure your hidden service, so that Tor relays requests coming from Tor " "users to your local server." msgstr "" +"Configure su servicio oculto para que Tor emita peticiones de los usuarios " +"de Tor a su servidor local." #. type: Content of: <html><body> #: en/services.html:50 @@ -103,16 +105,19 @@ msgid "" "There is a fine tutorial on the Tor website (https://www.torproject.org/docs" "/tor-hidden-service.html) that describes these steps in more detail." msgstr "" +"Hay un tutorial disponible en la página web de Tor " +"(https://www.torproject.org/docs/tor-hidden-service.html) donde se explican " +"esos detalles con más profundidad." #. type: Content of: <html><body> #: en/services.html:55 msgid "<a name=\"data\"/>" -msgstr "" +msgstr "<a name=\"data\"/>" #. type: Content of: <html><body><h3> #: en/services.html:56 msgid "What data do I need to provide?" -msgstr "" +msgstr "¿Qué datos tengo que ofrecer?" #. type: Content of: <html><body> #: en/services.html:58 @@ -120,6 +125,8 @@ msgid "" "The services table contains five columns containing data about configured " "hidden services:" msgstr "" +"La tabla de servicio tiene cinco columnas con datos acerca de los servicios " +"ocultos configurados." #. type: Content of: <html><body><ul><li> #: en/services.html:61

1 0