[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1890: Clarify that when we ask for the password, we want the passw (in trunk: . src/gui src/lang)
Author: edmanm
Date: 2007-08-27 18:46:44 -0400 (Mon, 27 Aug 2007)
New Revision: 1890
Modified:
trunk/
trunk/src/gui/mainwindow.cpp
trunk/src/lang/vidalia_bg.ts
trunk/src/lang/vidalia_cs.ts
trunk/src/lang/vidalia_de.ts
trunk/src/lang/vidalia_en.ts
trunk/src/lang/vidalia_es.ts
trunk/src/lang/vidalia_fa.ts
trunk/src/lang/vidalia_fi.ts
trunk/src/lang/vidalia_fr.ts
trunk/src/lang/vidalia_hu.ts
trunk/src/lang/vidalia_it.ts
trunk/src/lang/vidalia_nb.ts
trunk/src/lang/vidalia_nl.ts
trunk/src/lang/vidalia_pl.ts
trunk/src/lang/vidalia_pt.ts
trunk/src/lang/vidalia_ru.ts
trunk/src/lang/vidalia_sv.ts
trunk/src/lang/vidalia_zh-cn.ts
trunk/src/lang/vidalia_zh-tw.ts
Log:
r2098@adrastea: edmanm | 2007-08-27 18:46:35 -0400
Clarify that when we ask for the password, we want the password instead of the
hash of the password. Also, lupdate the translations (hello 3584 line diff).
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r2098] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/src/gui/mainwindow.cpp
===================================================================
--- trunk/src/gui/mainwindow.cpp 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/gui/mainwindow.cpp 2007-08-27 22:46:44 UTC (rev 1890)
@@ -831,7 +831,7 @@
/* Bad password, so prompt for a new one. */
QString password = QInputDialog::getText(this,
tr("Password Authentication Required"),
- tr("Please enter your control password:"),
+ tr("Please enter your control password (not the hash):"),
QLineEdit::Password);
if (!password.isEmpty()) {
TorSettings settings;
Modified: trunk/src/lang/vidalia_bg.ts
===================================================================
--- trunk/src/lang/vidalia_bg.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_bg.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -881,22 +881,22 @@
<translation>Грешка при стартиране на Тор</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Грешка при свързване с Тор</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Грешка при спиране на Тор</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Изход от Тор успешен</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Видалиа не успя да спре Тор.</translation>
</message>
@@ -906,7 +906,7 @@
<translation type="unfinished">Тор работи</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Сървърът е включен</translation>
</message>
@@ -916,17 +916,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Грешка при прилагане на сървърните настройки</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Видалиа не успя да приложи твоите настройки за сървъра.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -935,7 +935,7 @@
Бихте ли желали да прекъснете културно, давайки време на клиентите да намерят нов сървър?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -959,7 +959,7 @@
<translation>Опции</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Нова самоличност</translation>
</message>
@@ -969,12 +969,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Всички последващи връзки ще изглеждат различни от старите ви връзки.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Неуспех при създаване на Нова Самоличност</translation>
</message>
@@ -1120,65 +1120,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2121,19 +2121,19 @@
<translation>Невалиден GUI стил:</translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Видалиа вече работи</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/src/lang/vidalia_cs.ts
===================================================================
--- trunk/src/lang/vidalia_cs.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_cs.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,27 +883,27 @@
<translation>Chyba pri spusteni Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Chyba pripojeni na Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Chyba zastaveni Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor Ukoncen</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia nemuze zastavit Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Server je aktivni</translation>
</message>
@@ -913,17 +913,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Chyba ulozeni nastaveni serveru</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia nemuze ulozit vase nastaveni serveru</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -932,7 +932,7 @@
Ukoncite aplikaci az po nalazeni nahradniho serveru klientem?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -956,7 +956,7 @@
<translation>Nastaveni</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Nova identita</translation>
</message>
@@ -966,12 +966,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Vsechny nasledujici pripojeni budou od puvodnich rozdilne.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Vytvoreni nove identity selhalo.</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2121,12 +2121,12 @@
<translation>Neplatne GUI rozhrani: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia je spustena</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2135,7 +2135,7 @@
Chces pokracovat v spusteni Vidalia?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Neplatny Argument</translation>
</message>
Modified: trunk/src/lang/vidalia_de.ts
===================================================================
--- trunk/src/lang/vidalia_de.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_de.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -884,22 +884,22 @@
<translation>Fehler beim Starten von Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Fehler bei der Verbindung zu Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Fehler beim Stoppen von Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor beendet</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia konnte Tor nicht anhalten.</translation>
</message>
@@ -909,7 +909,7 @@
<translation>Tor läuft</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Server ist eingeschalten</translation>
</message>
@@ -919,17 +919,17 @@
<translation>Strg+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Fehler beim Anwenden der Servereinstellungen</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia konnte die Servereinstellungen nicht anwenden.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -939,7 +939,7 @@
Wollen Sie den Server vorsichtig beenden, um Clients Zeit zu geben einen neuen Server zu finden?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -963,7 +963,7 @@
<translation>Einstellungen</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Neue Identität</translation>
</message>
@@ -973,13 +973,13 @@
<translation>Strg+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Alle folgenden Verbindungen werden anders als alte
Verbindungen erscheinen.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Konnte keine neue Identität erstellen</translation>
</message>
@@ -1127,65 +1127,65 @@
<translation>Starte Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation>Cookie-Authentifizierung erforderlich</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation>Tor-Datenverzeichnis</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation>Tor-Kontrollcookie (control_auth_cookie)</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2131,12 +2131,12 @@
<translation>Ungültiges GUI-Aussehen angegeben: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia wurde bereits gestartet</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2145,7 +2145,7 @@
Wollen Sie mit dem Start von Vidalia fortfahren?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Ungültiges Argument</translation>
</message>
Modified: trunk/src/lang/vidalia_en.ts
===================================================================
--- trunk/src/lang/vidalia_en.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_en.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -881,27 +881,27 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation type="unfinished"></translation>
</message>
@@ -911,24 +911,24 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -950,7 +950,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation type="unfinished"></translation>
</message>
@@ -960,12 +960,12 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation type="unfinished"></translation>
</message>
@@ -1116,65 +1116,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2106,19 +2106,19 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/src/lang/vidalia_es.ts
===================================================================
--- trunk/src/lang/vidalia_es.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_es.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Error al Iniciar Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Error Conectando a Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Error Deteniendo Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor ha Salido</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia no pudo detener Tor.</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor esta ejecutándose</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Servidor esta Habilitado</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Error Aplicando Preferencias del Servidor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia no pudo aplicar las preferencias de su servidor.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
żDesea apagar cuidadosamente y dar a los clientes tiempo para encontrar un nuevo servidor?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Preferencias</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Nueva Identidad</translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Todas las conexiones subsecuentes aparecerán diferente que sus conexiones antiguas.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Falló en Crear Nueva Identidad</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2122,19 +2122,19 @@
<translation>Estilo de Interfaz Gráfica especificada invalida:</translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia ya está ejecutándose.</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
<translation>Otro proceso de Vidalia esta posiblemente ejecutándose. Si realmente no hay otro proceso de Vidalia ejecutándose, puede elegir para continuar de todas maneras.</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Argumento Invalido</translation>
</message>
Modified: trunk/src/lang/vidalia_fa.ts
===================================================================
--- trunk/src/lang/vidalia_fa.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_fa.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -881,27 +881,27 @@
<translation>خطا در راهاندازی تُر</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>خطا در اتصال به تُر</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>خطا در توقف تُر</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>تُر خاتمه پیدا کرد</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>ویدالیا نتوانست تُر را متوقف کند</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>سرور فعال شده</translation>
</message>
@@ -911,24 +911,24 @@
<translation>کنترل + N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>اعمال تنظیمات سرور با خطا مواجه شد</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>ویدالیا نتوانست تنظیمات شما برای سرور را اعمال کند</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
<translation>شما در حال حاظر یک سرور در حال اجرا دارید. خاتمه دادن به کار سرور تمام اتصالات کاربران را مختل خواهد کرد. آیا مایل هستید به کاربران کمی فرصت دهید تا سرور دیگری پیدا کنند و آنگاه سرور را خاموش کنید؟</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -950,7 +950,7 @@
<translation>تنظیمات</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>هویت جدید</translation>
</message>
@@ -960,12 +960,12 @@
<translation>کنترل + I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>تمام اتصالات بعدی به صورت متفاوت از اتصالات قبلی نمایش داده خواهند شد.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>ایجاد هویت جدید به شکست انجامید</translation>
</message>
@@ -1116,65 +1116,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2108,12 +2108,12 @@
<translation>نوع واسط گرافیکی مشخص شده نامربوط است</translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>ویدالیا در حال اجرا است</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2122,7 +2122,7 @@
آیا مایل به ادامه شروع ویدالیا هستید؟</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/src/lang/vidalia_fi.ts
===================================================================
--- trunk/src/lang/vidalia_fi.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_fi.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Virhe Tor-ohjelman käynnistymisessä</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Virhe yhdistettäessä Tor-ohjelmaan</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Virhe Tor-ohjelman pysähtymisessä</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor yllättäen pysähtyi</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia ei onnistunut pysäyttämään Tor-ohjelmaa</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor on päällä</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Palvelin on käytössä</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Virhe palvelinasetusten käyttöönottamisessa</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia ei onnistunut ottamaan käyttöön palvelimesi asetuksia</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
Haluaisitteko sulkea turvallisesti ja antaen käyttäjille aikaa löytää uuden palvelimen?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Asetukset</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Uusi henkilöllisyys</translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Seuraavat yhteydet tulevat olemaan erilaiset kuin vanhat.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Uuden henkilöllisyyden luominen epäonnistui</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2121,12 +2121,12 @@
<translation>Virheellinen teema valittu: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia on jo päällä</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2135,7 +2135,7 @@
Haluatko jatkaa Vidalian käynnistämistä?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Virheellinen komento</translation>
</message>
Modified: trunk/src/lang/vidalia_fr.ts
===================================================================
--- trunk/src/lang/vidalia_fr.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_fr.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Erreur de démarrage Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Erreur de connexion à Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Erreur d'arrêt Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor a été quitté</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia n'a pas pu arrêter Tor.</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor est actif</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Le serveur est activé</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Erreur en appliquant les options du serveur</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia n'a pas pu appliquer les options du serveur.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
Voulez-vous arrêter de manière graduelle afin de donner le temps aux clients Tor de trouver un nouveau serveur ?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Voir réseau Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Nouvelle identité</translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Toutes les connexions suivantes sembleront être différentes des précédentes.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>La création d'une nouvelle identité a échoué</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2123,12 +2123,12 @@
<translation>Style d'interface spécifié invalide : </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia fonctionne déjà</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2137,7 +2137,7 @@
Voulez-vous continuer à démarrer Vidalia ?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Argument invalide</translation>
</message>
Modified: trunk/src/lang/vidalia_hu.ts
===================================================================
--- trunk/src/lang/vidalia_hu.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_hu.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -884,22 +884,22 @@
<translation>Hiba a Tor indításával</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Hiba a Tor-hoz kapcsolódással</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Hiba a Tor leállításával</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>A Tor bezáródott</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>A Vidalia nem tudta leállítani a Tor-t.</translation>
</message>
@@ -909,7 +909,7 @@
<translation type="unfinished">A Tor fut</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>A szerver bekapcsolva</translation>
</message>
@@ -919,18 +919,18 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Hiba a szerver beállításainak mentésében</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>A Vidalia nem tudta érvényesíteni a szerver
beállításait.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -941,7 +941,7 @@
újabb szerverek megtalálására?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -969,7 +969,7 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation type="unfinished">Új identitás</translation>
</message>
@@ -979,13 +979,13 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation type="unfinished">Minden további kapcsolat a régi kapcsolataidtól
különbözõként fog szerepelni.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation type="unfinished">Nem sikerült az új identitás létrehozása</translation>
</message>
@@ -1131,65 +1131,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2137,19 +2137,19 @@
<translation>A megadott grafikus felület stílus érvénytelen: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>A Vidalia már fut</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/src/lang/vidalia_it.ts
===================================================================
--- trunk/src/lang/vidalia_it.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_it.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Errore nell'avvio di Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Errore nella connessione a Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Errore nell'arresto di Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor è chiuso</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia non è riuscito a fermare Tor.</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor è avviato</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Il server è abilitato</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Errore nell'applicazione delle impostazioni del server</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia non è riuscito ad utilizzare le impostazioni del server.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
Si desidera chiudere delicatamente e dare ai client il tempo di trovare un nuovo server?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Mappa della Rete</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Nuova identità</translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Tutte le nuove connessioni verranno visualizzate in modo diverso dalle vecchie.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Impossibile creare una nuova identità</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2123,12 +2123,12 @@
<translation>Lo stile GUI specificato non è valido: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia è già in esecuzione</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2137,7 +2137,7 @@
Continuare con l'avvio di Vidalia?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Parametro non valido</translation>
</message>
Modified: trunk/src/lang/vidalia_nb.ts
===================================================================
--- trunk/src/lang/vidalia_nb.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_nb.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Feil ved oppstart av Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Feil ved tilknytning til Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Feil ved Stopping av Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor Avsluttet</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia klarte ikke å avslutte Tor</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor kjører</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Tjeneren er tilkoblet</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Feil ved pålegging av Tjener-Innstillinger</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia kunne ikke iverksette dine tjener-innstillinger.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
Vil du stenge ned gradvis og gi dine klienter tid til å finne en ny tjener?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Innstillinger</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Ny Identitet </translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Alle dine forbindelser vil se annerledes ut enn dine nåværende forbindelser.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Kunne ikke lage Ny Identitet</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2114,12 +2114,12 @@
<translation>Ugyldig GUI-stil spesifisert:</translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia kjører allerede</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2128,7 +2128,7 @@
Vil du fortsette og starte Vidalia?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Ugyldig Argument</translation>
</message>
Modified: trunk/src/lang/vidalia_nl.ts
===================================================================
--- trunk/src/lang/vidalia_nl.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_nl.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Fout bij Starten Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Fout bij Verbinden met Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Fout bij Stoppen Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor is Afgesloten</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia was niet in staat Tor te stoppen.</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor is actief</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Server is Ingeschakeld</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Fout bij Toepassen Server Instellingen</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia was niet in staat de server instellingen toe te passen.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
Wilt u op stijlvolle wijze afsluiten en clients de tijd gunnen om een nieuwe server te vinden?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Instellingen</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Nieuwe Identiteit</translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Alle eerstvolgende verbindingen zullen anders lijken dan uw oude verbindingen.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Creëren van Nieuwe Identiteit Mislukt</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2124,12 +2124,12 @@
<translation>Ongeldige GUI stijl opgegeven: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia is reeds actief</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2138,7 +2138,7 @@
Wilt u doorgaan met het starten van Vidalia?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Ongeldige Waarde</translation>
</message>
Modified: trunk/src/lang/vidalia_pl.ts
===================================================================
--- trunk/src/lang/vidalia_pl.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_pl.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Błąd uruchamiania Tora</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Błąd podłączenia do Tora</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Bład zatrzymywania Tora</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor wyłączony</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia nie mogła zatrzymać Tora</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor aktywny</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Serwer uaktywniony</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Aktualizacja ustawień serwera nie powiodła się</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia nie była w stanie zaktualizować ustawień Twojego serwera</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
Czy chciałbyś dokonać tego elegancko, dając klientom czas na znalezienie nowego serwera?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Ustawienia</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Nowa Tożsamość</translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Wszystkie następne połączenia będą inne niż Twoje obecne.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Tworzenie nowej tożsamości nie powiodło się.</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2119,12 +2119,12 @@
<translation>Wybrano niewłaściwy styl GUI: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia jest już uruchomiona</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2133,7 +2133,7 @@
Czy chcesz kontynuować uruchamianie Vidalii?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Błędny parametr.</translation>
</message>
Modified: trunk/src/lang/vidalia_pt.ts
===================================================================
--- trunk/src/lang/vidalia_pt.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_pt.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,27 +883,27 @@
<translation>Erro ao Iniciar o Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Erro ao Conectar ao Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Erro ao Parar o Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor Finalizado</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>O Vidalia não pôde parar o Tor.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>O Servidor está habilitado</translation>
</message>
@@ -913,17 +913,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Erro ao Aplicar as Configurações ao Servidor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>O Vidalia foi incapaz de aplicar as configurações do servidor.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -932,7 +932,7 @@
Você gostaria de finalizá-lo graciosamente e dar tempo aos clientes para que encontrem outro servidor?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -956,7 +956,7 @@
<translation>Configurações</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Nova Identidade</translation>
</message>
@@ -966,12 +966,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>As novas conexões irão parecer diferentes das conexões antigas.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Falha ao Criar Nova Identidade</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2123,19 +2123,19 @@
<translation>O estilo de GUI especificado é inválido: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>O Vidalia já se encontra em execução</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/src/lang/vidalia_ru.ts
===================================================================
--- trunk/src/lang/vidalia_ru.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_ru.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,22 +883,22 @@
<translation>Ошибка запуска Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Ошибка подсоединения к Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Ошибка остановки Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor завершил работу</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia не смогла остановить Tor.</translation>
</message>
@@ -908,7 +908,7 @@
<translation>Tor запущен</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Сервер включён</translation>
</message>
@@ -918,17 +918,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Ошибка применения настроек сервера</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia не смогла применить ваши настройки для сервера.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -937,7 +937,7 @@
Не хотите ли вы аккуратно остановить сервер и дать клиентам немного времени чтобы найти другой сервер?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -961,7 +961,7 @@
<translation>Настройки</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Новый Ним</translation>
</message>
@@ -971,12 +971,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Все последующие соединения не будут связаны с предыдущими соединениями.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Ошибка создания нового Нима</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2124,12 +2124,12 @@
<translation>Указан неверный стиль интерфейса: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia уже запущена</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2138,7 +2138,7 @@
Вы хотите продолжить запуск Vidalia?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Неверный параметр</translation>
</message>
Modified: trunk/src/lang/vidalia_sv.ts
===================================================================
--- trunk/src/lang/vidalia_sv.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_sv.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -883,27 +883,27 @@
<translation>Det gick ej att Starta Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>Det gick ej att ansluta till Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>Det gick ej att stoppa Tor</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor har avslutats</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia kunde ej stoppa Tor.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>Servern är aktivierad</translation>
</message>
@@ -913,17 +913,17 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>Det gick ej att tillämpa inställningarna för servern</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia kunde ej tillämpa inställningarna för servern.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -932,7 +932,7 @@
Var en cool tjomme och låt servern stängas ner kontrollerat så att anslutna klienter kan hitta en ny server, okej?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -956,7 +956,7 @@
<translation>Inställningar</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>Ny identitet</translation>
</message>
@@ -966,12 +966,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>Efterföljande anslutningar kommer att framstå som olika från dina gamla anslutningar.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>Kunde ej skapa ny identitet</translation>
</message>
@@ -1122,65 +1122,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2122,12 +2122,12 @@
<translation>Ogiltig stil för användargränssnittet har angetts:</translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia är redan igång</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
@@ -2136,7 +2136,7 @@
Vill du fortsätta att starta Vidalia?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation>Ogiltigt argument</translation>
</message>
Modified: trunk/src/lang/vidalia_zh-cn.ts
===================================================================
--- trunk/src/lang/vidalia_zh-cn.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_zh-cn.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -881,27 +881,27 @@
<translation>启动 Tor 时发生错误</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>连接到 Tor 时发生错误</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>停止 Tor 时发生错误</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor 已停止</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia 无法停止 Tor.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>服务器模式被启用</translation>
</message>
@@ -911,24 +911,24 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>应用服务器设定时发生错误</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia 无法应用服务器设定.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
<translation>当前正在运行为 Tor 服务器模式.终止服务器模式将会中断任何客户端连接.是否要关闭服务器?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -950,7 +950,7 @@
<translation>设定</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>更换身份</translation>
</message>
@@ -960,12 +960,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>所有新建连接将会不同于之前的连接.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>创建新身份失败</translation>
</message>
@@ -1116,65 +1116,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2106,19 +2106,19 @@
<translation>指定界面风格无效: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia 已经运行</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
<translation>另一个 Vidalia 进程已经运行.如果确定无其它 Vidalia 进程正在运行,可以选择继续.确定要继续运行 Vidalia 吗?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation type="unfinished"></translation>
</message>
Modified: trunk/src/lang/vidalia_zh-tw.ts
===================================================================
--- trunk/src/lang/vidalia_zh-tw.ts 2007-08-27 22:24:49 UTC (rev 1889)
+++ trunk/src/lang/vidalia_zh-tw.ts 2007-08-27 22:46:44 UTC (rev 1890)
@@ -881,27 +881,27 @@
<translation>啟動 Tor 時發生錯誤</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="567"/>
+ <location filename="../gui/mainwindow.cpp" line="569"/>
<source>Error Connecting to Tor</source>
<translation>連接到 Tor 時發生錯誤</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="624"/>
+ <location filename="../gui/mainwindow.cpp" line="626"/>
<source>Error Stopping Tor</source>
<translation>停止 Tor 時發生錯誤</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="655"/>
+ <location filename="../gui/mainwindow.cpp" line="657"/>
<source>Tor Exited</source>
<translation>Tor 已停止</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="625"/>
+ <location filename="../gui/mainwindow.cpp" line="627"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia 無法停止 Tor.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="597"/>
+ <location filename="../gui/mainwindow.cpp" line="599"/>
<source>Server is Enabled</source>
<translation>伺服器模式被啟用</translation>
</message>
@@ -911,24 +911,24 @@
<translation>Ctrl+N</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="797"/>
+ <location filename="../gui/mainwindow.cpp" line="802"/>
<source>Error Applying Server Settings</source>
<translation>應用伺服器設定時發生錯誤</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="798"/>
+ <location filename="../gui/mainwindow.cpp" line="803"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia 無法應用伺服器設定.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="602"/>
+ <location filename="../gui/mainwindow.cpp" line="604"/>
<source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
Would you like to shutdown gracefully and give clients time to find a new server?</source>
<translation>當前正在執行為 Tor 伺服器模式.終止伺服器模式將會中斷任何客戶端連接.是否要關閉伺服器?</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="658"/>
+ <location filename="../gui/mainwindow.cpp" line="660"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -950,7 +950,7 @@
<translation>設定</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="944"/>
+ <location filename="../gui/mainwindow.cpp" line="952"/>
<source>New Identity</source>
<translation>更換身份</translation>
</message>
@@ -960,12 +960,12 @@
<translation>Ctrl+I</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="947"/>
+ <location filename="../gui/mainwindow.cpp" line="955"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>所有建立連接將會不同於之前的連接.</translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="975"/>
+ <location filename="../gui/mainwindow.cpp" line="983"/>
<source>Failed to Create New Identity</source>
<translation>創建新身份失敗</translation>
</message>
@@ -1116,65 +1116,65 @@
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="731"/>
+ <location filename="../gui/mainwindow.cpp" line="735"/>
<source>Cookie Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="734"/>
+ <location filename="../gui/mainwindow.cpp" line="738"/>
<source>Tor requires Vidalia to send the contents of an authentication cookie, but Vidalia was unable to find one.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="736"/>
+ <location filename="../gui/mainwindow.cpp" line="740"/>
<source>Would you like to browse for the file 'control_auth_cookie' yourself?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="742"/>
+ <location filename="../gui/mainwindow.cpp" line="747"/>
<source>Tor Data Directory</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="744"/>
+ <location filename="../gui/mainwindow.cpp" line="749"/>
<source>Tor Control Cookie (control_auth_cookie)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="786"/>
+ <location filename="../gui/mainwindow.cpp" line="791"/>
<source>Error Registering for Events</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="788"/>
+ <location filename="../gui/mainwindow.cpp" line="793"/>
<source>Vidalia was unable to register for Tor events. Many of Vidalia's features may be unavailable.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="826"/>
+ <location filename="../gui/mainwindow.cpp" line="833"/>
<source>Password Authentication Required</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="827"/>
- <source>Please enter your control password:</source>
- <translation type="unfinished"></translation>
- </message>
- <message>
- <location filename="../gui/mainwindow.cpp" line="838"/>
+ <location filename="../gui/mainwindow.cpp" line="845"/>
<source>Error Authenticating to Tor</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="840"/>
+ <location filename="../gui/mainwindow.cpp" line="847"/>
<source>Vidalia was unable to authenticate to Tor. (%1)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/mainwindow.cpp" line="842"/>
+ <location filename="../gui/mainwindow.cpp" line="849"/>
<source>Please check your control port authentication settings.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/mainwindow.cpp" line="834"/>
+ <source>Please enter your control password (not the hash):</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>MessageLog</name>
@@ -2106,19 +2106,19 @@
<translation>指定介面風格無效: </translation>
</message>
<message>
- <location filename="../main.cpp" line="86"/>
+ <location filename="../main.cpp" line="99"/>
<source>Vidalia is already running</source>
<translation>Vidalia 已經執行</translation>
</message>
<message>
- <location filename="../main.cpp" line="92"/>
+ <location filename="../main.cpp" line="105"/>
<source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
Would you like to continue starting Vidalia?</source>
<translation>另一個 Vidalia 進程已經執行.如果確定無其它 Vidalia 進程正在執行,可以選擇繼續.確定要繼續執行 Vidalia 嗎?</translation>
</message>
<message>
- <location filename="../main.cpp" line="72"/>
+ <location filename="../main.cpp" line="85"/>
<source>Invalid Argument</source>
<translation type="unfinished"></translation>
</message>