[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r2179: Tweak English, not code. (in trunk: . src/control src/gui)
Author: edmanm
Date: 2007-12-05 11:45:02 -0500 (Wed, 05 Dec 2007)
New Revision: 2179
Modified:
trunk/
trunk/src/control/dangerousversionevent.cpp
trunk/src/control/torcontrol.cpp
trunk/src/gui/mainwindow.cpp
trunk/src/gui/mainwindow.h
Log:
r2234@lysithea: edmanm | 2007-12-05 11:44:54 -0500
Tweak English, not code.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /local/vidalia/trunk [r2234] on 0108964c-5b0b-4c9e-969f-e2288315d100
Modified: trunk/src/control/dangerousversionevent.cpp
===================================================================
--- trunk/src/control/dangerousversionevent.cpp 2007-12-05 07:26:16 UTC (rev 2178)
+++ trunk/src/control/dangerousversionevent.cpp 2007-12-05 16:45:02 UTC (rev 2179)
@@ -20,7 +20,7 @@
****************************************************************/
/**
- * \file dangerousversionevent.h
+ * \file dangerousversionevent.cpp
* \version $Id$
* \brief Event sent when Tor realizes its version is not recommended
*/
Modified: trunk/src/control/torcontrol.cpp
===================================================================
--- trunk/src/control/torcontrol.cpp 2007-12-05 07:26:16 UTC (rev 2178)
+++ trunk/src/control/torcontrol.cpp 2007-12-05 16:45:02 UTC (rev 2179)
@@ -79,8 +79,8 @@
delete _controlConn;
}
-/** Start the Tor process. Returns true if the process was successfully
- * started, otherwise returns false. */
+/** Start the Tor process using the executable <b>tor</b> and the list of
+ * arguments in <b>args</b>. */
void
TorControl::start(const QString &tor, const QStringList &args)
{
Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp 2007-12-05 07:26:16 UTC (rev 2178)
+++ trunk/src/gui/mainwindow.cpp 2007-12-05 16:45:02 UTC (rev 2179)
@@ -1024,7 +1024,7 @@
}
}
-/** Called when Tor thinks its version if old or unrecommended, and displays a
+/** Called when Tor thinks its version is old or unrecommended, and displays a
* message notifying the user. */
void
MainWindow::dangerousTorVersion()
Modified: trunk/src/gui/mainwindow.h
===================================================================
--- trunk/src/gui/mainwindow.h 2007-12-05 07:26:16 UTC (rev 2178)
+++ trunk/src/gui/mainwindow.h 2007-12-05 16:45:02 UTC (rev 2179)
@@ -162,7 +162,7 @@
/** Checks the status of the current version of Tor to see if it's old,
* unrecommended, or obsolete. */
void checkTorVersion();
- /** Called when Tor thinks its version if old or unrecommended, and displays
+ /** Called when Tor thinks its version is old or unrecommended, and displays
* a message notifying the user. */
void dangerousTorVersion();