[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2642: Initial trademark compliance fixes: change some instances of (in vidalia: . trunk/src/vidalia trunk/src/vidalia/config)
Author: edmanm
Date: 2008-06-01 20:57:31 -0400 (Sun, 01 Jun 2008)
New Revision: 2642
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/config/serverpage.ui
vidalia/trunk/src/vidalia/mainwindow.cpp
Log:
r422@thebe: edmanm | 2008-06-01 20:58:09 -0400
Initial trademark compliance fixes: change some instances of "Tor" to "the Tor
software" and remove most of the others.
Property changes on: vidalia
___________________________________________________________________
svk:merge ticket from /local/vidalia [r422] on 45a62a8a-8088-484c-baad-c7b3e776dd32
Modified: vidalia/trunk/src/vidalia/config/advancedpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/advancedpage.ui 2008-06-02 00:20:28 UTC (rev 2641)
+++ vidalia/trunk/src/vidalia/config/advancedpage.ui 2008-06-02 00:57:31 UTC (rev 2642)
@@ -216,7 +216,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="title" >
- <string>Tor Configuration File</string>
+ <string>Configuration File</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
@@ -237,7 +237,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Start Tor with the specified configuration file (torrc)</string>
+ <string>Start the Tor software with the specified configuration file (torrc)</string>
</property>
</widget>
</item>
@@ -256,7 +256,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Select path to Tor configuration file</string>
+ <string>Select path to your configuration file</string>
</property>
<property name="text" >
<string>Browse</string>
@@ -272,7 +272,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="title" >
- <string>Tor Data Directory</string>
+ <string>Data Directory</string>
</property>
<layout class="QHBoxLayout" >
<property name="margin" >
@@ -293,7 +293,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Store Tor data in the following directory</string>
+ <string>Store data for the Tor software in the following directory</string>
</property>
</widget>
</item>
@@ -312,7 +312,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Select the directory used to store Tor data</string>
+ <string>Select the directory used to store data for the Tor software</string>
</property>
<property name="text" >
<string>Browse</string>
Modified: vidalia/trunk/src/vidalia/config/generalpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/generalpage.ui 2008-06-02 00:20:28 UTC (rev 2641)
+++ vidalia/trunk/src/vidalia/config/generalpage.ui 2008-06-02 00:57:31 UTC (rev 2642)
@@ -35,7 +35,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="title" >
- <string>Tor Executable</string>
+ <string>Executable</string>
</property>
<layout class="QHBoxLayout" >
<property name="spacing" >
@@ -60,7 +60,7 @@
<item>
<widget class="QCheckBox" name="chkRunTorAtVidaliaStartup" >
<property name="text" >
- <string>Start Tor when Vidalia starts</string>
+ <string>Start the Tor software when Vidalia starts</string>
</property>
</widget>
</item>
Modified: vidalia/trunk/src/vidalia/config/networkpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/networkpage.ui 2008-06-02 00:20:28 UTC (rev 2641)
+++ vidalia/trunk/src/vidalia/config/networkpage.ui 2008-06-02 00:57:31 UTC (rev 2642)
@@ -22,7 +22,7 @@
<item>
<widget class="QCheckBox" name="chkUseProxy" >
<property name="toolTip" >
- <string>Check to configure Tor to use a proxy to access the Internet</string>
+ <string>Check if your local network requires a proxy to access the Internet</string>
</property>
<property name="text" >
<string>I use a proxy to access the Internet</string>
@@ -173,7 +173,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Check to configure Tor to only connect to relays using ports allowed by your firewall</string>
+ <string>Check to only connect to relays using ports allowed by your firewall</string>
</property>
<property name="text" >
<string>My firewall only lets me connect to certain ports</string>
@@ -232,7 +232,7 @@
<item>
<widget class="QCheckBox" name="chkUseBridges" >
<property name="toolTip" >
- <string>Check to configure Tor to encrypt its directory requests and, optionally, use bridge relays to access the Tor network</string>
+ <string>Check to encrypt directory requests and, optionally, use bridge relays to access the Tor network</string>
</property>
<property name="text" >
<string>My ISP blocks connections to the Tor network</string>
@@ -259,7 +259,7 @@
</size>
</property>
<property name="title" >
- <string>Tor Bridge Settings</string>
+ <string>Bridge Settings</string>
</property>
<layout class="QVBoxLayout" >
<property name="margin" >
@@ -271,7 +271,7 @@
<item>
<widget class="QLabel" name="lblNoBridgeSupport" >
<property name="text" >
- <string>The Tor version you are currently running does not support bridges. <br>Tor will still try to encrypt its directory connections.</string>
+ <string>The Tor software you are currently running does not support bridges. <br>Your directory connections will still be encrypted.</string>
</property>
<property name="alignment" >
<set>Qt::AlignCenter</set>
Modified: vidalia/trunk/src/vidalia/config/serverpage.ui
===================================================================
--- vidalia/trunk/src/vidalia/config/serverpage.ui 2008-06-02 00:20:28 UTC (rev 2641)
+++ vidalia/trunk/src/vidalia/config/serverpage.ui 2008-06-02 00:57:31 UTC (rev 2642)
@@ -22,7 +22,7 @@
<item>
<widget class="QRadioButton" name="rdoClientMode" >
<property name="text" >
- <string>Run Tor as a client only</string>
+ <string>Run as a client only</string>
</property>
</widget>
</item>
@@ -107,7 +107,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="toolTip" >
- <string>Enable to mirror the Tor relay directory</string>
+ <string>Enable to mirror the relay directory</string>
</property>
<property name="text" >
<string>Mirror the Relay Directory </string>
@@ -944,7 +944,7 @@
<enum>Qt::NoContextMenu</enum>
</property>
<property name="text" >
- <string>What Internet resources should Tor users be able to access from your Tor relay?</string>
+ <string>What Internet resources should users be able to access from your relay?</string>
</property>
<property name="wordWrap" >
<bool>true</bool>
Modified: vidalia/trunk/src/vidalia/mainwindow.cpp
===================================================================
--- vidalia/trunk/src/vidalia/mainwindow.cpp 2008-06-02 00:20:28 UTC (rev 2641)
+++ vidalia/trunk/src/vidalia/mainwindow.cpp 2008-06-02 00:57:31 UTC (rev 2642)
@@ -275,7 +275,7 @@
void
MainWindow::createActions()
{
- _startStopAct = new QAction(QIcon(IMG_START_TOR_16), tr("Start Tor"), this);
+ _startStopAct = new QAction(QIcon(IMG_START_TOR_16), tr("Start"), this);
connect(_startStopAct, SIGNAL(triggered()), this, SLOT(start()));
_exitAct = new QAction(QIcon(IMG_EXIT), tr("Exit"), this);
@@ -477,7 +477,7 @@
if (status == Stopped) {
statusText = tr("Tor is not running");
- actionText = tr("Start Tor");
+ actionText = tr("Start");
trayIconFile = IMG_TOR_STOPPED;
statusIconFile = IMG_TOR_STOPPED_48;
_startStopAct->setEnabled(true);
@@ -496,17 +496,17 @@
connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(start()));
} else if (status == Stopping) {
if (_delayedShutdownStarted) {
- statusText = tr("Your Tor relay is shutting down.\n"
- "Click 'Stop Tor' again to force Tor to stop now.");
+ statusText = tr("Your relay is shutting down.\n"
+ "Click 'Stop' again to stop your relay now.");
} else {
statusText = tr("Tor is shutting down");
}
trayIconFile = IMG_TOR_STOPPING;
statusIconFile = IMG_TOR_STOPPING_48;
- ui.lblStartStopTor->setStatusTip(tr("Stop Tor Now"));
+ ui.lblStartStopTor->setStatusTip(tr("Stop Now"));
} else if (status == Started) {
- actionText = tr("Stop Tor");
+ actionText = tr("Stop");
_startStopAct->setEnabled(true);
_startStopAct->setText(actionText);
_startStopAct->setIcon(QIcon(IMG_STOP_TOR_16));
@@ -522,16 +522,16 @@
connect(_startStopAct, SIGNAL(triggered()), this, SLOT(stop()));
connect(ui.lblStartStopTor, SIGNAL(clicked()), this, SLOT(stop()));
} else if (status == Starting) {
- statusText = tr("Tor is starting up");
+ statusText = tr("Starting up...");
trayIconFile = IMG_TOR_STARTING;
statusIconFile = IMG_TOR_STARTING_48;
_startStopAct->setEnabled(false);
- ui.lblStartStopTor->setText(tr("Starting Tor"));
+ ui.lblStartStopTor->setText(tr("Starting"));
ui.lblStartStopTor->setEnabled(false);
ui.lblStartStopTor->setStatusTip(statusText);
ui.lblStartStopTor->setAnimation(QPixmap(ANIM_PROCESS_WORKING));
} else if (status == CircuitEstablished) {
- statusText = tr("Tor is running");
+ statusText = tr("Running");
trayIconFile = IMG_TOR_RUNNING;
statusIconFile = IMG_TOR_RUNNING_48;
}
@@ -690,7 +690,7 @@
{
/* Ok, ok. It really isn't going to connect. I give up. */
int response = VMessageBox::warning(this,
- tr("Error Connecting to Tor"), p(errmsg),
+ tr("Connection Error"), p(errmsg),
VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
VMessageBox::Retry, VMessageBox::Help);
@@ -723,7 +723,7 @@
if (server.isServerEnabled() && !_delayedShutdownStarted) {
/* Ask the user if they want to shutdown nicely. */
int response = VMessageBox::question(this, tr("Relaying is Enabled"),
- tr("You are currently running a Tor relay. "
+ tr("You are currently running a relay. "
"Terminating your relay will interrupt any "
"open connections from clients.\n\n"
"Would you like to shutdown gracefully and "
@@ -749,8 +749,9 @@
if (!rc) {
/* We couldn't tell Tor to stop, for some reason. */
- int response = VMessageBox::warning(this, tr("Error Stopping Tor"),
- p(tr("Vidalia was unable to stop Tor.")) + p(errmsg),
+ int response = VMessageBox::warning(this, tr("Error Shutting Down"),
+ p(tr("Vidalia was unable to stop the Tor software."))
+ + p(errmsg),
VMessageBox::Ok|VMessageBox::Default|VMessageBox::Escape,
VMessageBox::Help);
@@ -780,10 +781,11 @@
* SIGINT, Tor will exit(0). We might need to change this warning message
* if this turns out to not be the case. */
if (exitStatus == QProcess::CrashExit || exitCode != 0) {
- int ret = VMessageBox::warning(this, tr("Tor Exited"),
- tr("Vidalia detected that Tor exited unexpectedly.\n\n"
- "Please check the message log for indicators "
- "about what happened to Tor before it exited."),
+ int ret = VMessageBox::warning(this, tr("Unexpected Error"),
+ tr("Vidalia detected that the Tor software exited "
+ "unexpectedly.\n\n"
+ "Please check the message log for recent "
+ "warning or error messages."),
VMessageBox::Ok|VMessageBox::Escape,
VMessageBox::ShowLog|VMessageBox::Default,
VMessageBox::Help);
@@ -856,9 +858,9 @@
/* Prompt the user to find their control_auth_cookie */
int ret = VMessageBox::question(this,
tr("Cookie Authentication Required"),
- p(tr("Tor requires Vidalia to send the contents of an "
- "authentication cookie, but Vidalia was unable to "
- "find one."))
+ p(tr("The Tor software requires Vidalia to send the "
+ "contents of an authentication cookie, but Vidalia "
+ "was unable to find one."))
+ p(tr("Would you like to browse for the file "
"'control_auth_cookie' yourself?")),
VMessageBox::Browse|VMessageBox::Default,
@@ -867,9 +869,9 @@
if (ret == VMessageBox::Cancel)
goto cancel;
QString cookieDir = QFileDialog::getOpenFileName(this,
- tr("Tor Data Directory"),
+ tr("Data Directory"),
settings.getDataDirectory(),
- tr("Tor Control Cookie (control_auth_cookie)"));
+ tr("Control Cookie (control_auth_cookie)"));
if (cookieDir.isEmpty())
goto cancel;
cookieDir = QFileInfo(cookieDir).absolutePath();
@@ -911,7 +913,7 @@
/* Register for any pertinent asynchronous events. */
if (!_torControl->setEvents(&errmsg)) {
VMessageBox::warning(this, tr("Error Registering for Events"),
- p(tr("Vidalia was unable to register for Tor events. "
+ p(tr("Vidalia was unable to register for some events. "
"Many of Vidalia's features may be unavailable."))
+ p(errmsg),
VMessageBox::Ok);
@@ -956,8 +958,8 @@
} else {
/* Something else went wrong */
int ret = VMessageBox::warning(this,
- tr("Error Authenticating to Tor"),
- p(tr("Vidalia was unable to authenticate to Tor. "
+ tr("Authentication Error"),
+ p(tr("Vidalia was unable to authenticate to the Tor software. "
"(%1)").arg(errmsg)) +
p(tr("Please check your control port authentication "
"settings.")),