[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1404: Give non-Windowsers a hint about where their vidalia.pid liv (trunk/src)
Author: edmanm
Date: 2006-10-27 00:30:09 -0400 (Fri, 27 Oct 2006)
New Revision: 1404
Modified:
trunk/src/main.cpp
Log:
Give non-Windowsers a hint about where their vidalia.pid lives, in case
Vidalia incorrectly thinks another Vidalia is running.
Modified: trunk/src/main.cpp
===================================================================
--- trunk/src/main.cpp 2006-10-27 00:52:38 UTC (rev 1403)
+++ trunk/src/main.cpp 2006-10-27 04:30:09 UTC (rev 1404)
@@ -76,10 +76,19 @@
VMessageBox::critical(0,
qApp->translate("Vidalia",
QT_TRANSLATE_NOOP("Vidalia", "Vidalia is already running")),
- qApp->translate("Vidalia",
+#if defined(Q_OS_WIN32)
+ vApp->translate("Vidalia",
QT_TRANSLATE_NOOP("Vidalia",
"Another Vidalia process is already running. \n\n"
"This Vidalia process will now exit.")),
+#else
+ vApp->translate("Vidalia",
+ QT_TRANSLATE_NOOP("Vidalia",
+ "Another Vidalia process is already running. \n\n"
+ "This Vidalia process will now exit. \n\n"
+ "(If there really is not another Vidalia process running, "
+ "you can delete %1 before starting Vidalia again.)")).arg(pidfile),
+#endif
VMessageBox::Ok);
return 0;
}