[vidalia-svn] r2709: Reorg and reword a couple of the bootstrapping status messag (in vidalia: . trunk/src/vidalia)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-13 02:04:34 -0400 (Fri, 13 Jun 2008)
New Revision: 2709

Modified:
   vidalia/
   vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
 r541@thebe:  edmanm | 2008-06-13 02:05:14 -0400
 Reorg and reword a couple of the bootstrapping status messages.



Property changes on: vidalia
___________________________________________________________________
 svk:merge ticket from /local/vidalia [r541] on 45a62a8a-8088-484c-baad-c7b3e776dd32

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-13 05:48:59 UTC (rev 2708)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-13 06:04:34 UTC (rev 2709)
@@ -527,9 +527,9 @@
   QString description;
   switch (bse->status()) {
     case BootstrapStatusEvent::ConnectingToDirMirror:
+      description = tr("Connecting to a relay directory");
+      break;
     case BootstrapStatusEvent::HandshakingWithDirMirror:
-      description = tr("Connecting to a directory mirror");
-      break;
     case BootstrapStatusEvent::CreatingOneHopCircuit:
       description = tr("Establishing an encrypted directory connection");
       break;
@@ -549,9 +549,11 @@
       description = tr("Loading relay information");
       break;
     case BootstrapStatusEvent::ConnectingToEntryGuard:
+      description = tr("Connecting to the Tor network");
+      break;
     case BootstrapStatusEvent::HandshakingWithEntryGuard:
     case BootstrapStatusEvent::EstablishingCircuit:
-      description = tr("Connecting to the Tor network");
+      description = tr("Establishing a Tor circuit");
       break;
     case BootstrapStatusEvent::BootstrappingDone:
       description = tr("Connected to the Tor network!");