[vidalia-svn] r2704: "Thou shalt not use 'Tor' as a noun" is optional, I'm told. (in vidalia: . trunk/src/vidalia trunk/src/vidalia/config)

[edmanm@xxxxxxxxxxxxxxxxxxx]

Author: edmanm
Date: 2008-06-12 19:24:53 -0400 (Thu, 12 Jun 2008)
New Revision: 2704

Modified:
   vidalia/
   vidalia/trunk/src/vidalia/config/advancedpage.ui
   vidalia/trunk/src/vidalia/config/generalpage.ui
   vidalia/trunk/src/vidalia/config/networkpage.ui
   vidalia/trunk/src/vidalia/mainwindow.cpp
   vidalia/trunk/src/vidalia/mainwindow.ui
Log:
 r531@thebe:  edmanm | 2008-06-12 19:25:33 -0400
 "Thou shalt not use 'Tor' as a noun" is optional, I'm told. Except when it
 isn't. (?)



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

Modified: vidalia/trunk/src/vidalia/config/advancedpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/advancedpage.ui	2008-06-12 23:22:39 UTC (rev 2703)
+++ vidalia/trunk/src/vidalia/config/advancedpage.ui	2008-06-12 23:24:53 UTC (rev 2704)
@@ -216,7 +216,7 @@
       <enum>Qt::NoContextMenu</enum>
      </property>
      <property name="title" >
-      <string>Configuration File</string>
+      <string>Tor Configuration File</string>
      </property>
      <layout class="QHBoxLayout" >
       <property name="margin" >

Modified: vidalia/trunk/src/vidalia/config/generalpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/generalpage.ui	2008-06-12 23:22:39 UTC (rev 2703)
+++ vidalia/trunk/src/vidalia/config/generalpage.ui	2008-06-12 23:24:53 UTC (rev 2704)
@@ -35,7 +35,7 @@
       <enum>Qt::NoContextMenu</enum>
      </property>
      <property name="title" >
-      <string>Executable</string>
+      <string>Tor Executable</string>
      </property>
      <layout class="QHBoxLayout" >
       <property name="spacing" >

Modified: vidalia/trunk/src/vidalia/config/networkpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/networkpage.ui	2008-06-12 23:22:39 UTC (rev 2703)
+++ vidalia/trunk/src/vidalia/config/networkpage.ui	2008-06-12 23:24:53 UTC (rev 2704)
@@ -271,7 +271,7 @@
       <item>
        <widget class="QLabel" name="lblNoBridgeSupport" >
         <property name="text" >
-         <string>The Tor software you are currently running does not support bridges. &lt;br>Your directory connections will still be encrypted.</string>
+         <string>The Tor software you are currently running does not support bridges. &lt;br>Directory connections will still be encrypted.</string>
         </property>
         <property name="alignment" >
          <set>Qt::AlignCenter</set>

Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-12 23:22:39 UTC (rev 2703)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp	2008-06-12 23:24:53 UTC (rev 2704)
@@ -291,7 +291,7 @@
 void 
 MainWindow::createActions()
 {
-  _startStopAct = new QAction(QIcon(IMG_START_TOR_16), tr("Start"), this);
+  _startStopAct = new QAction(QIcon(IMG_START_TOR_16), tr("Start Tor"), this);
   connect(_startStopAct, SIGNAL(triggered()), this, SLOT(start()));
 
   _exitAct = new QAction(QIcon(IMG_EXIT), tr("Exit"), this);
@@ -534,7 +534,7 @@
 
   if (status == Stopped) {
       statusText = tr("Tor is not running");
-      actionText = tr("Start");
+      actionText = tr("Start Tor");
       trayIconFile = IMG_TOR_STOPPED;
       statusIconFile = IMG_TOR_STOPPED_48;
       _startStopAct->setEnabled(true);
@@ -561,9 +561,9 @@
       trayIconFile = IMG_TOR_STOPPING;
       statusIconFile = IMG_TOR_STOPPING_48;
       
-      ui.lblStartStopTor->setStatusTip(tr("Stop Now"));
+      ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now"));
   } else if (status == Started) {
-      actionText = tr("Stop");
+      actionText = tr("Stop Tor");
       _startStopAct->setEnabled(true);
       _startStopAct->setText(actionText);
       _startStopAct->setIcon(QIcon(IMG_STOP_TOR_16));
@@ -579,16 +579,16 @@
       connect(_startStopAct, SIGNAL(triggered()), this, SLOT(stop()));
       connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(stop()));
   } else if (status == Starting)  {
-      statusText = tr("Starting up...");
+      statusText = tr("Tor is starting up...");
       trayIconFile = IMG_TOR_STARTING;
       statusIconFile = IMG_TOR_STARTING_48;
       _startStopAct->setEnabled(false);
-      ui.lblStartStopTor->setText(tr("Starting"));
+      ui.lblStartStopTor->setText(tr("Starting Tor"));
       ui.lblStartStopTor->setEnabled(false);
       ui.lblStartStopTor->setStatusTip(statusText);
       //ui.lblStartStopTor->setAnimation(QPixmap(ANIM_PROCESS_WORKING));
   } else if (status == CircuitEstablished) {
-      statusText = tr("Running");
+      statusText = tr("Tor is Running");
       trayIconFile = IMG_TOR_RUNNING;
       statusIconFile = IMG_TOR_RUNNING_48;
   }

Modified: vidalia/trunk/src/vidalia/mainwindow.ui
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.ui	2008-06-12 23:22:39 UTC (rev 2703)
+++ vidalia/trunk/src/vidalia/mainwindow.ui	2008-06-12 23:24:53 UTC (rev 2704)
@@ -174,10 +174,10 @@
         <item row="0" column="0" colspan="2" >
          <widget class="VClickLabel" native="1" name="lblStartStopTor" >
           <property name="text" >
-           <string>Start</string>
+           <string>Start Tor</string>
           </property>
           <property name="statusTip" >
-           <string>Start</string>
+           <string>Start Tor</string>
           </property>
           <property name="pixmap" >
            <pixmap>:/images/48x48/start-tor.png</pixmap>