[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1667: lupdate the .ts files. (in trunk: . src/lang)
Author: edmanm
Date: 2007-03-10 20:14:46 -0500 (Sat, 10 Mar 2007)
New Revision: 1667
Modified:
trunk/
trunk/src/lang/vidalia_bg.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_zh-cn.ts
trunk/src/lang/vidalia_zh-tw.ts
Log:
r1720@adrastea: edmanm | 2007-03-10 20:09:49 -0500
lupdate the .ts files.
Property changes on: trunk
___________________________________________________________________
svk:merge ticket from /vidalia/local/trunk [r1720] on 54b3572a-7227-0410-958f-53ecd705b71a
Modified: trunk/src/lang/vidalia_bg.ts
===================================================================
--- trunk/src/lang/vidalia_bg.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_bg.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,127 +59,142 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>ÐÑÐÑÑÐÑÐÐ ÐÐÑ Ñ ÐÐÑÐÐÐÐÐÐ ÐÐÐÑ. ÑÐÐÐ (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>ÐÐÐÐÑÐ ÐÑÑ ÐÐ ÐÐÑ ÐÐÐÑ. ÑÐÐÐ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>ÐÐÐÐÐÑÑÐ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>ÐÐÐÑÐÑÐÐÐÑ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>ÐÑÐÑÑÐÑÐÐ ÐÐÑÐ ÐÐÑÑÐÐÐÑÐÐ:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>ÐÐÐÐÐÐÐ ÑÐ ÑÑÐÑÑÐÑÐ Ñ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐ ÐÐÑÑÐÐÐÑÐÐ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>ÐÑÐÑÑÐÑÐÐ ÐÐÑÐ ÐÑÑÐÐ:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>ÐÐÐÐÐÐÐ ÑÐ ÑÑÐÑÑÐÑÐ Ñ ÐÑÐÐÐÑÐ ÐÐ ÑÐÐÐ ÐÑÑÐÐ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>ÐÐÐÐÑÐ ÐÐÑ ÐÐÐÑÐÐÑÑÐÑÐÐÐÐÐ ÑÐÐÐ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>ÐÐÐÐÑÑ ÐÐ Ð ÐÐÐÐÑÐÐ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 ÐÐ ÑÑÑÐÑÑÐÑÐÐ. ÐÑÐÐÑÐ ÐÐ ÐÐ ÐÐ ÑÑÐÐÐÐÐÑÐ?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>ÐÐÑÑÐÐÑÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÑÐÐÐ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>ÐÐÐÑÐÐÐÐÐÐÑÑ ÐÐ ÑÑÐÐÐÐÐÐÐ ÐÐ %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -402,12 +417,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation type="unfinished"></translation>
</message>
@@ -415,42 +430,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÐÐ Ñ %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>ÐÑÐÑÐÐ ÐÑÐ ÐÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÑ. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>ÐÑÐÑÐÐ ÐÑÐ ÐÐÐÑÐÑÐÐÐ ÐÐ ÐÐÐÑÑÐÐÐÐ ÐÐÐÐÐÐÐ. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>ÐÐÑÐÐÑÑÐÐ ÐÐ ÑÐÐÐÑ ÐÑÐ ÐÐÐÑ ÐÐ ÑÐÑÐÐÐ ÐÐ ÐÐÐÐÐ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>ÐÑÐÑÐÐ ÐÐÐÑÑÐÐÐÐ ÐÑÐÐÐÐÑ. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation type="unfinished"></translation>
@@ -1871,7 +1886,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>ÐÑÐÑÐÑ %1 ÐÐ ÑÑÐÑ ÐÐ ÑÐÑÐ. [%2]</translation>
</message>
@@ -1879,13 +1894,13 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
+ <location filename="../control/torservice.cpp" line="155"/>
+ <source>The Tor service is not installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/torservice.cpp" line="152"/>
- <source>The Tor service is not installed.</source>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
<translation type="unfinished"></translation>
</message>
</context>
Modified: trunk/src/lang/vidalia_de.ts
===================================================================
--- trunk/src/lang/vidalia_de.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_de.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Kontroll-Port</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Starte Tor mit der angegebenen Konfigurationsdatei (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>WÃhlen Sie den Pfad zur Tor-Konfigurationsdatei aus</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Ãffnen</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Berechtigungen</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Als folgender Nutzer ausfÃhren:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia wird mit den Berechtigungen dieses Nutzers laufen</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Als folgende Gruppe ausfÃhren:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia wird mit den Berechtigungen dieser Gruppe laufen</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>WÃhlen Sie die Tor-Konfigurationsdatei aus</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Datei nicht gefunden</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 existiert nicht. Soll es erstellt werden?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Datei konnte nicht erstellt werden</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>Konnte %1 nicht erstellen [2%]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>Dienst</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Aktivieren Sie diese Option, um Tor als Windows-Dienst auszufÃhren</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>Tor als Windows-Dienst im Hintergrund ausfÃhren</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>Tor-Dienst konnte nicht entfernt werden</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>Tor-Dienst konnte nicht installiert werden</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia konnte Tor nicht als Dienst einrichten.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Sie mÃssen ihn manuell entfernen.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Tor-Konfigurationsdatei</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>Port den Vidalia zur Kommunikation mit Tor benutzt.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>Kontrollsocket ist nicht verbunden.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>Kontrollsocket ist nicht verbunden</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Fehler beim Verbinden zu: %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Fehler beim Trennen des Sockets. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Fehler beim Senden eines Steuerkommandos. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Beim Lesen von Daten wurde der Socket unterbrochen.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>Unbekannte Kontrollantwort. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>Das Kontrollsocket ist nicht verbunden.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia konnte die Version von Tors Kontrollprotokoll nicht ermitteln. ÃberprÃfen Sie, ob Ihre Kontrollportnummer korrekt angegeben wurde und ob Sie eine aktuelle Tor-Version benutzen.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia unterstÃtzt nur Version 1 des Tor-Kontrollprotokolls (Version %1 gefunden).
@@ -1882,7 +1897,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Prozess %1 wurde nicht gestoppt. [%2]</translation>
</message>
@@ -1890,15 +1905,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>Tor-Dienst konnte nicht gestartet werden.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>Der Tor-Dienst ist nicht installiert.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_en.ts
===================================================================
--- trunk/src/lang/vidalia_en.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_en.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,127 +59,142 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -402,12 +417,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation type="unfinished"></translation>
</message>
@@ -415,42 +430,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation type="unfinished"></translation>
@@ -1854,7 +1869,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation type="unfinished"></translation>
</message>
@@ -1862,13 +1877,13 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
+ <location filename="../control/torservice.cpp" line="155"/>
+ <source>The Tor service is not installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/torservice.cpp" line="152"/>
- <source>The Tor service is not installed.</source>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
<translation type="unfinished"></translation>
</message>
</context>
Modified: trunk/src/lang/vidalia_es.ts
===================================================================
--- trunk/src/lang/vidalia_es.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_es.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Puerto de Control</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Iniciar Tor con el archivo de configuraciÃn especificado (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Seleccione el ruta del archivo de configuraciÃn de Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Navegar</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Permisos</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Ejecutar como Usuario:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia se ejecutara con los permisos de este Usuario</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Ejecutar como Grupo:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia se ejecutara con los permisos de este Grupo</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Seleccione el Archivo de ConfiguraciÃn de Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Archivo No Encontrado</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 no existe. Desea crearlo?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Error al Crear Archivo</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>No se pudo crear %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>Servicio</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Habilitar esto si usted desea que Tor se ejecute como un servicio de Windows.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>Ejecutar Tor como un servicio de Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>No se pudo remover el Servicio Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>No se pudo instalar el Servicio Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia no pudo instalar el servicio Tor.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Necesitara removerlo manualmente.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Archivo de ConfiguraciÃn de Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>Conector de Control no està conectado.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>Conector de Control no està conectado.</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Error connectando a %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Error desconectando conexiÃn. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Error enviando comando de control. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>ConexiÃn desconectada mientras se trataba de leer una lÃnea de informaciÃn.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>Respuesta de control invalida. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>ConexiÃn de control no esta conectada.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation type="unfinished"></translation>
@@ -1872,7 +1887,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Proceso %1 fallà en detener. [%2]</translation>
</message>
@@ -1880,15 +1895,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>No se puede iniciar el servicio Tor.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>El servicio Tor no esta instalado.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_fa.ts
===================================================================
--- trunk/src/lang/vidalia_fa.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_fa.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,127 +59,142 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>ØØÚØÙ ÚÙØØÙ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>ÛÛÛÛ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>ØØÙâØÙØØØÛ ØØ ØØ ÙØÛÙ ÙÛÚØØÙØÛ ÙØØØ ØØÙ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>ÙØÛØ ÙØÛÙ ÙÛÚØØÙØÛ ØØ ØØ ØÙØØØØ ÚÙ </translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>ØÙØØØØ ÙØÛÙ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>ØØÙØ ØØØØØÛ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>ÚØØØØ ØØØØ ÚÙÙØÙ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>ÙÛØØÙÛØ ØØ ØØÙØ ØØØØØÛ ØÛÙ ÚØØØØ ØØØØ ØÙØÙØ ØØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>ÚØÙÙ ØØØØÚÙÙØÙ:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>ÙÛØØÙÛØ ØØ ØØÙØ ØØØØØÛ ØÛÙ ÚØÙÙ ØØØØ ØÙØÙØ ØØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>ØÙØØØØ ÙØÛÙ ÙÛÚØØÙØÛ </translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>ÙØÛÙ ÙÙØØ ÙØØ ÙÛØØ ÙØØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation> ÙØÛÙ %1 ÙØÙØ ÙØØØØ. ØÛØ ÙÛâØÙØÙÛØ ØÙ ØØ ØØØØÛØØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>ØÛØØØ ÙØÛÙ ÙØÙÙÙÙ ØÙØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation> [%2] ÙÙÛâØÙØÙÙ %1 ØØ ØÛØØØ ÚÙÙ </translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>ØØÙÛØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>ØÚØ ÙÛâØÙØÙÛ ØØ ØØ ØÙ ØÙÙØÙ ÛÚÛ ØØ ØØÙÛØâÙØÛ ÙÛÙØÙØ ØØØØ ÚÙÛØ ØÛÙ ÚØÛÙÙ ØØ ÙØØÙ ÚÙ.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>ØØ ØØ ØØ ÙØâØÙÛÙÙ ØØØØ ÚÙ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>ØØÙ ØØÙÛØ ÙÙÚÙ ÙØÙØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>ÙØØ ØØÙÛØ ÙÙÚÙ ÙØÙØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>ÙÛØØÙÛØ ÙØÙØÙØØ ØØÙÛØ ØÙØ ØØ ÙØØ ÚÙØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
<translation>ÙÛØØÙÛØ ÙØÙØÙØØ ØØÙÛØ ØÙØ ØØ ØØÙ ÚÙØ. ÙÛâØÙØÙÛ ØÙ ØØ ØÙØØ ØØÙ ÚÙÛ.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>ÙØÛÙ ÙÛÚØØÙØÛ ØÙØ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>ØØÚØÙÛ ÚÙ ÙÛØØÙÛØ ØØØÛ ØØØØØØ ØØ ØÙØ ØØØÙØØÙ ÙÛâÚÙØ</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -402,12 +417,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>ØÙÚØ ÚÙØØÙ ÙØÙ ÙØØÙ</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>ØÙÚØ ÚÙØØÙ ÙØÙ ÙØØÙ</translation>
</message>
@@ -415,42 +430,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>%1:%2 [%3] ØØØ ØØ ØØØØÙ ØÙ</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>ØØØ ØØ ØÙØÙ ÙØØâÚØØÙ ØÙÚØ</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>ØØØ ØØ ØØØØÙ ØØØÙØØØ ÚÙØØÙ</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>ØØ ØÛÙ ØÙØØ ØØØÛ ØÙØÙØÙ ÛÚ ØØ ØØ ØØØÙâÙØ ØÙÚØ ÙØØ ØØ</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>ÙØØØ ÚÙØØÙÛ ÙØÙØØÙØ [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>ØÙÚØ ÚÙØØÙ ÙØÙ ÙØØÙ</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>ÙÛØØÙÛØ ÙØÙØÙØØ ÙØØÙâÛ ÚÙØØÙÛ ØÙØ ØØ ØØØÛØ ØÙØ. ØÙØØÙâÛ ØØÚØÙ ÚÙØØÙÛ ØØ ØØØØÛ ÚÙÛØ. ØØÙØ ØØ ÙØØÙâÙØÛ ØØÛØ ØÙØ ØØØÙØØÙ ÚÙÛØ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>ÙÛØØÙÛØ ØÙÙØ ÙØØÙâÛ Û ØØ ÙØÙØÚÙ ÚÙØØÙ ØÙØ ØØ ÙØØÛØØÙÛ ÙÛâÚÙØ (ÙØØÙ %1 ØØØÛØ ØØØÙ ØØ) ÙØØÙâÛ ØÙØ ØÙØ ØØ ØØØÙØ ØÙÛØ.</translation>
@@ -1858,7 +1873,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>ÙØØÛÙØ ØÙØØÙ %1 ÙØÙØÙØØ ÙØÙÙÙ ØÙØ. [%2]</translation>
</message>
@@ -1866,15 +1881,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>ÙØÙØÙØØÙ ØØÙÛØ ØÙØ ØØ ØØÙâØÙØØØÛ ÚÙÙ.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>ØØÙÛØ ØÙØ ÙØØ ÙØØÙ ØØØ</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_fi.ts
===================================================================
--- trunk/src/lang/vidalia_fi.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_fi.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Ohjausportti</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>KÃynnistà Tor kyseisellà asetustiedostolla (torcc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Valitse Tor-asetustiedoston sijainti</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Selaa</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Oikeudet</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Suorita kÃyttÃjÃnÃ:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia kÃynnistyy tÃmÃn kÃyttÃjÃn oikeuksilla</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Suorita ryhmÃnÃ:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia kÃynnistyy tÃmÃn ryhmÃn oikeuksilla</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Valitse Tor-asetustiedosto</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Tiedostoa ei lÃydy</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 tiedostoa ei ole olemassa. Haluatko luoda sen?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Tiedoston luominen epÃonnistui</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>Tiedoston %1 luominen epÃonnistui [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>Palvelu</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Valitsemalla tÃmÃ, Tor-ohjelmaa suoritetaan Windowssin palveluna</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>Suorita Tor taustalla Windowssin palveluna</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>Tor-palvelun poisto epÃonnistui</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>Tor-palvelun asennus epÃonnistui</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia epÃonnistui Tor-palvelun asennuksessa.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Tor-palvelu tÃytyy poistaa kÃsin.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Tor-asetustiedosto</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>Portti, jolla Vidalia kÃyttÃÃ Tor-ohjelmaa.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>Ohjausyhteyttà ei ole muodostettu.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>Ohjausyhteyttà ei ole muodostettu</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Virhe yhdistettÃessà %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Virhe yhteyden lopettamisessa. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Virhe lÃhetettÃessà ohjauskomentoa. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Yhteys pÃÃttyi yrittÃessÃÃn lukea tietoa.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>Virheellinen ohjausvastaus. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>Ohjausyhteyttà ei ole muodostettu.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia ei onnistunut tunnistamaan Tor-ohjelman kÃyttÃmÃn ohjausprotokollan versiota. Tarkista onko ohjausportti asetettu oikein ja, ettà kÃytÃt uutta versiota Tor-ohjelmasta.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia tukee vain 1 versiota Tor-ohjelman ohjausprotokollaa (versio %1 havaittu).
@@ -1872,7 +1887,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Prosessi %1 epÃonnistui pysÃhtymÃstÃ. [%2]</translation>
</message>
@@ -1880,15 +1895,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>Tor-palvelun kÃynnistyminen epÃonnistui.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>Tor-palvelua ei ole asennettu.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_fr.ts
===================================================================
--- trunk/src/lang/vidalia_fr.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_fr.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Port de contrÃle</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>DÃmarre Tor avec le fichier de configuration spÃcifià (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>SÃlectionner le chemin du fichier de configuration de Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Parcourir</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Autorisations</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>ExÃcuter en tant que...:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia dÃmarrera avec les permissions de l'Utilisateur</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>DÃmarrer en tant que groupe :</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia dÃmarrera avec les droits du groupe</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>SÃlectionner le fichier de configuration Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Fichier non trouvÃ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 n'existe pas. Voulez-vous le crÃer ?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>La crÃation du fichier a ÃchouÃ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>Impossible de crÃer %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>Service</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Cocher ici si vous voulez que Tor dÃmarre comme un service Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>DÃmarre Tor en arriÃre-plan comme un service Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>Impossible d'enlever le service Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>Impossible d'installer le service Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia n'a pas pu installer le service Tor.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Vous devrez peut-Ãtre enlever manuellement le service Tor.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Fichier de configuration Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>Port utilisà par Vidalia pour communiquer avec Tor.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>Le socket de contrÃle n'est pas connectÃ.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>Le socket de contrÃle n'est pas connectÃ</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Erreur de connexion à %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Erreur de dÃconnexion du socket. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Erreur d'envoi de la commande de contrÃle. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Socket dÃconnectà durant la lecture d'une ligne de donnÃes.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>RÃponse de commande invalide. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>Le socket de contrÃle n'est pas connectÃ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia n'a pas pu dÃterminer la version du protocole de contrÃle de Tor. VÃrifiez que le numÃro du port de contrÃle est correctement configurà et que vous utilisez une version rÃcente de Tor. </translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia accepte uniquement la Version 1 du protocole de contrÃle de Tor (version %1 dÃtectÃe)
@@ -1874,7 +1889,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Processus %1 ne s'est pas arrÃtÃ. [%2]</translation>
</message>
@@ -1882,15 +1897,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>Impossible de dÃmarrer le service Tor.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>Le service Tor n'est pas installÃ.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_hu.ts
===================================================================
--- trunk/src/lang/vidalia_hu.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_hu.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,127 +59,142 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>VezÃrlà port</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Tor indÃtÃsa a megadott konfigurÃciÃs fÃjllal (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Tor konfigurÃciÃs fÃjl ÃtjÃnak megadÃsa</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>BÃngÃszÃs</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>EngedÃlyek</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Fusson a kÃvetkezà felhasznÃlà nevÃben:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>A Vidalia a megadott felhasznÃlà jogosultsÃgaival fog futni</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Fusson a kÃvetkezà csoport nevÃben:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>A Vidalia a megadott csoport jogaival fog futni</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Tor konfigurÃciÃs fÃjl kivÃlasztÃsa</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -402,12 +417,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation type="unfinished"></translation>
</message>
@@ -415,43 +430,43 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Hiba lÃpett fel %1:%2-hez tÃrtÃnÃ
kapcsolÃdÃs kÃzben. [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>A kapcsolat bontÃsa kÃzben hiba lÃpett fel. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Hiba tÃrtÃnt a kontroll parancs kÃldÃsekor. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>A kapcsolat megszÃnt egy adatsor beolvasÃsa kÃzben.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>ÃrvÃnytelen kontroll vÃlasz. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation type="unfinished"></translation>
@@ -1891,7 +1906,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>%1 folyamatot nem sikerÃlt leÃllÃtani. [%2]</translation>
</message>
@@ -1899,13 +1914,13 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
+ <location filename="../control/torservice.cpp" line="155"/>
+ <source>The Tor service is not installed.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/torservice.cpp" line="152"/>
- <source>The Tor service is not installed.</source>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
<translation type="unfinished"></translation>
</message>
</context>
Modified: trunk/src/lang/vidalia_it.ts
===================================================================
--- trunk/src/lang/vidalia_it.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_it.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Porta di controllo</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Avvia Tor con il file di configurazione specificato (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Imposta la directory del file di configurazione di Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Sfoglia</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Permessi</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Esegui come utente:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia sarà avviato con i permessi di questo utente</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Esegui come gruppo:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia sarà avviato con i permessi di questo gruppo</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Scegliere il file di configurazione di Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>File non trovato.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 non esiste. Crearlo?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Non à possibile creare il file</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>Non à possibile creare %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>Servizio</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Abilita questa opzione se vuoi eseguire Tor come servizio di Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>Esegui Tor in background</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>Impossibile rimuovere Tor dalla lista dei servizi di Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>Impossibile installare Tor tra i servizi di Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia non à stato in grado di inserire Tor tra i servizi di Windows.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Potrebbe essere necessario rimuoverlo manualmente.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>File di configurazione di Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation type="unfinished"></translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>Il socket di controllo non à connesso.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>Il socket di controllo non à connesso</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Errore durante la connessione a %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Errore nella disconnessione del socket. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Errore nell'invio del comando di controllo. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Il socket si à disconnesso durante il tentativo di leggere una linea di dati.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>Risposta di controllo non valida. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>Il socket di controllo non à connesso.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation type="unfinished"></translation>
@@ -1873,7 +1888,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Il processo %1 non à riuscito a terminare. [%2]</translation>
</message>
@@ -1881,15 +1896,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>Impossibile lanciare Tor come servizio.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>Il servizio Tor non à nell'elenco dei servizi.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_nb.ts
===================================================================
--- trunk/src/lang/vidalia_nb.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_nb.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Kontroll Port</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Start Tor med den spesifiserte konfigurasjonsfilen (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Filsti til Tor sin konfigurasjonsfil</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Bla</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Tillatelser</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>KjÃr som Bruker:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia vil kjÃre med denne brukerens tillatelser</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>KjÃr under Gruppe:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia vil kjÃre med denne Gruppen's tillatelser</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Velg Konfigurasjonsfil for Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Finner Ikke Filen</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 finnes ikke. Vil du lage den?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Klarte ikke Lage FIl</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>Kunne ikke opprette %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>Tjeneste</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Skru dette pà om du vil kjÃre Tor som en WIndows-tjeneste</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>KjÃr Tor i bakgrunnen som en Windows-tjeneste</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>Kunne ikke fjerne Tor-tjenesten</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>Kunne ikke installere Tor-tjenesten</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia klarte ikke installere Tor-tjenesten</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Du mà kanskje fjerne den manuellt.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Tors Konfigurasjonsfil</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>Porten som Vidalia bruker til à kommunisere med Tor.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>Kontroll-porten er ikke tilkoblet.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>Kontroll-porten er ikke tilkoblet.</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Feil ved tilkobling til %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Feil ved frakobling av forbindelse [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Feil ved sending av kontroll-kommando. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Forbindelsen ble avbrutt under forsÃk pà à lese en linje med data.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>Ugyldig kontroll-svar: [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>Kontroll-porten er ikke tilkoblet.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia klarte ikke à fastslà Tors kontroll-protokoll versjon. Verifiser at du har angitt riktig kontroll-port og at du bruker en nyere utgave av Tor.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia stÃtter kun Versjon 1 av Tor's kontrollprotokoll (versjon %1 detektert).
@@ -1866,7 +1881,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Prosess %1 nektet à stoppe. [%2]</translation>
</message>
@@ -1874,15 +1889,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>Kunne ikke starte Tor-tjenesten</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>Tor tjenesten er ikke installert</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_nl.ts
===================================================================
--- trunk/src/lang/vidalia_nl.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_nl.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Beheer Poort</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Start Tor met het gespecificeerde configuratie bestand (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Kies het pad naar het Tor configuratie bestand</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Bladeren</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Machtigingen</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Voer uit als Gebruiker:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia zal worden uitgevoerd met de machtigingen van deze Gebruiker</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Voer uit als Groep:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia zal worden uitgevoerd met de machtigingen van deze Groep</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Kies Tor Configuratie Bestand</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Bestand Niet Gevonden</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 bestaat niet. Wilt u het aanmaken?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Maken van Bestand Mislukt</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>Niet in staat %1 [%2] aan te maken</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>Service</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Schakel dit in om Tor als Windows service te draaien</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>Voer Tor uit op de achtergrond als Windows service</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>Verwijderen Tor Service mislukt</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>Installeren Tor Service mislukt</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia was niet in staat om de Tor service te installeren.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Mogelijk kunt u het handmatig verwijderen.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Tor Configuratie Bestand</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>Poort die door Vidalia wordt gebruikt voor communicatie met Tor.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation type="unfinished"></translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Fout bij het verbinden met %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Fout bij het verbreken van de verbinding met de socket. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Fout bij het verzenden van het beheer commando. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Socket verbrak de verbinding bij poging tot het lezen van een regel met data.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>Ongeldig beheer antwoord. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia was niet in staat om Tor's control protocol versie te bepalen. Controleer dat het poort nummer goed is ingesteld en dat u een recente versie van Tor gebruikt.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia ondersteunt enkel Versie 1 van Tor's control protocol (versie %1 gedetecteerd).
@@ -1875,7 +1890,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Stoppen van proces %1 mislukt. [%2]</translation>
</message>
@@ -1883,15 +1898,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>Starten Tor service mislukt.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>De Tor service is niet genstalleerd.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_pl.ts
===================================================================
--- trunk/src/lang/vidalia_pl.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_pl.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Port sterujÄcy</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Uruchom Tor'a uÅywajÄc pliku konfiguracyjnego (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Wybierz ÅcieÅkÄ pliku konfiguracyjnego Tor'a</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>PrzeglÄdaj</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>Uprawnienia</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Uruchom jako UÅytkownik:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia wykorzysta uprawnienia tego UÅytkownika</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Uruchom jako Grupa:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia wykorzysta uprawnienia Grupy</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Wybierz plik konfiguracyjny Tor'a</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Pliku nie znaleziono</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 nie istnieje. Czy chcesz go utworzyÄ?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Nie udaÅo siÄ utworzyÄ pliku</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>Utworzenie %1 [%2] jest niemoÅliwe</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>UsÅuga</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Zaznacz, jeÅli chcesz uruchamiaÄ Tor'a jako usÅugÄ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>Uruchamiaj Tor'a jako usÅugÄ Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>UsuniÄcie usÅugi Tor'a nie powiodÅo siÄ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>Instalacja usÅugi Tor'a nie powiodÅa siÄ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia nie mogÅa zainstalowaÄ usÅugi Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Musisz usunÄÄ jÄ rÄcznie.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Plik konfiguracyjny Tor'a</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>Port ktÃrego Vidalia uÅywa do komunikacji z Tor'em</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>Gniazdo sterujÄce nie jest podÅÄczone.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>Gniazdo sterujÄce nie jest podÅÄczone</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>BÅÄd podÅÄczania do %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>BÅÄd przy rozÅÄczaniu gniazda. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>BÅÄd przy przy wysyÅaniu polecenia sterujÄcego. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Przy prÃbie odczytu danych gniazdo rozÅÄczyÅo siÄ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>NieprawidÅowy kod odpowiedzi. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>Gniazdo sterujÄce nie jest podÅÄczone.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia nie mogÅa ustaliÄ wersji protokoÅu sterujÄcego Tor'a. SprawdÅ, czy numer portu jest ustawiony poprawnie i Åe posiadasz uruchomionÄ najnowszÄ wersjÄ Tor'a.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia obsÅuguje jedynie WersjÄ 1 protokoÅu sterujÄcego (wykryto wersjÄ %1).</translation>
@@ -1869,7 +1884,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>Nieudana prÃba zatrzymania procesu %1. [%2]</translation>
</message>
@@ -1877,15 +1892,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>Uruchamianie usÅugi Tor'a nie powiodÅo siÄ.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>UsÅuga Tor'a nie jest zainstalowana.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_pt.ts
===================================================================
--- trunk/src/lang/vidalia_pt.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_pt.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,112 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>Porta de Controle</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>Iniciar o Tor com o seguinte arquivo de configuraÃÃo (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>Selecione o diretÃrio do arquivo de configuraÃÃo do Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>Navegar</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>PermissÃes</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>Executar como o UsuÃrio:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>O Vidalia serà executado com as permissÃes deste UsuÃrio</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>Executar como o Grupo:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>O Vidalia serà executado com as permissÃes deste Grupo</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>Escolha o arquivo de ConfiguraÃÃo do Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>Arquivo NÃo Encontrado</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 nÃo existe. Vocà gostaria de criÃ-lo?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>Falha ao Criar o Arquivo</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>NÃo foi possÃvel criar %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>ServiÃo</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>Habilite este se vocà deseja executar o Tor como um serviÃo do Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>Execute o Tor em segundo plano como um serviÃo do Windows</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>NÃo foi possÃvel remover o ServiÃo do Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>NÃo foi possÃvel instalar o ServiÃo do Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>O Vidalia nÃo conseguiu instalar o serviÃo do Tor.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -173,15 +173,30 @@
Vocà deverà removÃ-lo manualmente.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Arquivo de configuraÃÃo do Tor</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>Porta utilizada pelo Vidalia para comunicar-se com o Tor.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -404,12 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>O soquete de controle nÃo està conectado.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>O soquete de controle nÃo està conectado</translation>
</message>
@@ -417,42 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>Erro ao conectar a %1:%2 [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>Erro ao desconectar o soquete. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>Erro ao enviar um comando de controle. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>Soquete desconectado enquanto tentava ler uma linha de dados.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>Resposta de controle InvÃlida. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>O soquete de controle nÃo està conectado.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation type="unfinished"></translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation type="unfinished"></translation>
@@ -1873,7 +1888,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>O Processo %1 nÃo pÃde ser encerrado. [%2]</translation>
</message>
@@ -1881,15 +1896,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>NÃo foi possÃvel iniciar o serviÃo do Tor.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>O serviÃo do Tor nÃo està instalado.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_ru.ts
===================================================================
--- trunk/src/lang/vidalia_ru.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_ru.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -1,7 +1,9 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1">
<context>
<name></name>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="33"/>
<source>Arial</source>
<translation>Arial</translation>
</message>
@@ -9,38 +11,47 @@
<context>
<name>AboutDialog</name>
<message>
+ <location filename="../gui/about/aboutdialog.ui" line="290"/>
<source>About Vidalia</source>
<translation>Ð ÐÑÐÐÑÐÐÐÐ Vidalia</translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.ui" line="344"/>
<source>Vidalia</source>
<translation>Vidalia</translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.ui" line="512"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.ui" line="428"/>
<source>Qt</source>
<translation>Qt</translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.ui" line="443"/>
<source>Qt Version</source>
<translation>ÐÐÑÑÐÑ Qt</translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.ui" line="528"/>
<source>Tor Version</source>
<translation>ÐÐÑÑÐÑ Tor</translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.ui" line="359"/>
<source>Vidalia Version</source>
<translation>ÐÐÑÑÐÑ Vidalia</translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.cpp" line="79"/>
<source><Not Running></source>
<translation><ÐÐ ÐÐÐÑÑÐÐ></translation>
</message>
<message>
+ <location filename="../gui/about/aboutdialog.cpp" line="75"/>
<source><Unavailable></source>
<translation><ÐÐÐÐÐÐÑÑÐÐ></translation>
</message>
@@ -48,90 +59,112 @@
<context>
<name>AdvancedPage</name>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>ÐÐÑÑ ÐÐÐÑÑÐÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>ÐÐÐÑÑÐÐÑÑ Tor Ñ ÑÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐ ÐÐÐÑÐÐÑÑÐÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>ÐÑÐÐÑÐÑÐ ÐÑÑÑ Ð ÑÐÐÐÑ ÐÐÑÑÑÐÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>ÐÑÐÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>ÐÑÐÐÐ ÐÐÑÑÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>ÐÐÐÑÑÐÐÑÑ ÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ:</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia ÐÑÐÐÑ ÐÐÐÑÑÐÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>ÐÐÐÑÑÐÐÑÑ ÐÑ ÐÑÑÐÐÑ:</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia ÐÑÐÐÑ ÐÐÐÑÑÐÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐ ÐÑÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>ÐÑÐÐÑÐÑÐ ÑÐÐÐ ÐÐÑÑÑÐÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 ÐÐ ÑÑÑÐÑÑÐÑÐÑ. ÐÐÐÐÐÑÑ?</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ %1 [%2]</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>ÐÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>ÐÐÐÑÑÐÑÐ, ÐÑÐÐ ÑÐÑÐÑÐ ÐÐÐÑÑÐÐÑÑ Tor ÐÐÐ ÑÐÑÐÐÑ Windows</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>ÐÐÐÑÑÐÐÑÑ Tor Ð ÑÐÐÐ ÐÐÐ ÑÐÑÐÐÑ Windows</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>ÐÐ ÑÐÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÑÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ Tor.</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
@@ -140,33 +173,55 @@
ÐÐÐÐÐÐÐÐ ÐÐÐ ÑÐÐÐÑÐÑ ÑÐÐÐÐÑÑ ÐÐÐ ÐÑÑÑÐÑÑ.</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>ÐÐÐÐ ÐÐÑÑÑÐÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>ÐÐÑÑ, ÐÐÑÐÑÑÐ Vidalia ÐÑÐÐÐÑÐÑÐÑ ÐÐÑ ÑÐÑÐÐÐÐÐÐÑ Tor.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
<message>
+ <location filename="../gui/config/appearancepage.ui" line="301"/>
<source>Language</source>
<translation>ÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/config/appearancepage.ui" line="322"/>
<source>Choose the language used in Vidalia</source>
<translation>ÐÑÐÐÑÐÑÐ ÑÐÑÐ ÐÐÑÐÑÑÐÐÑÐ ÐÐÑ Vidalia</translation>
</message>
<message>
+ <location filename="../gui/config/appearancepage.ui" line="354"/>
<source>Changes to language will only take effect after restarting Vidalia!</source>
<translation>ÐÐÐÐÐÐÐÐÑ ÑÐÑÐÐ ÐÑÑÑÐÑÑ Ð ÑÐÐÑ ÑÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐÐÑÑÐÐ ÐÑÐÐÑÐÐÐÑ!</translation>
</message>
<message>
+ <location filename="../gui/config/appearancepage.ui" line="370"/>
<source>Style</source>
<translation>ÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/appearancepage.ui" line="404"/>
<source>Choose Vidalia's interface style</source>
<translation>ÐÑÐÐÑÐÑÐ ÑÑÐÐÑ ÐÐÑÐÑÑÐÐÑÐ</translation>
</message>
@@ -174,58 +229,72 @@
<context>
<name>BandwidthGraph</name>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="490"/>
<source>Tor Bandwidth Usage</source>
<translation>ÐÑÐÑÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="514"/>
<source>Show Settings</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="537"/>
<source>Reset</source>
<translation>ÐÐÑÐÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="630"/>
<source>Receive Rate</source>
<translation>ÐÑÐÑÐÐ ÐÑ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="654"/>
<source>Send Rate</source>
<translation>ÐÑÐÑÐÐ ÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="773"/>
<source>Changes the transparency of the Bandwidth Graph</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÑÐÐÑÑÑ ÑÑÐÐÐ ÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="932"/>
<source>Save</source>
<translation>ÐÐÑÑÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="939"/>
<source>Cancel</source>
<translation>ÐÑÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.cpp" line="170"/>
<source>Since:</source>
<translation>ÐÐÐÐÐÐÐÐ ÐÑ :</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="857"/>
<source>100</source>
<translation>100</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="872"/>
<source>% Opaque</source>
<translation>% ÐÐÐÑÐÐÑÐÑÐÐÑÑÐ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.cpp" line="236"/>
<source>Hide Settings</source>
<translation>ÐÐÑÑÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="667"/>
<source>Always on Top</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/bwgraph.ui" line="723"/>
<source>Style</source>
<translation>ÐÑÐÐÑ</translation>
</message>
@@ -233,26 +302,32 @@
<context>
<name>Circuit</name>
<message>
+ <location filename="../control/circuit.cpp" line="109"/>
<source>New</source>
<translation>ÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../control/circuit.cpp" line="110"/>
<source>Open</source>
<translation>ÐÑÐÑÑÑÑÐ</translation>
</message>
<message>
+ <location filename="../control/circuit.cpp" line="111"/>
<source>Building</source>
<translation>ÐÐÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../control/circuit.cpp" line="112"/>
<source>Failed</source>
<translation>ÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../control/circuit.cpp" line="113"/>
<source>Closed</source>
<translation>ÐÐÐÑÑÑÑÐ</translation>
</message>
<message>
+ <location filename="../control/circuit.cpp" line="114"/>
<source>Unknown</source>
<translation>ÐÐÐÐÐÐÑÑÐÐ</translation>
</message>
@@ -260,6 +335,7 @@
<context>
<name>CircuitItem</name>
<message>
+ <location filename="../gui/network/circuititem.cpp" line="48"/>
<source><Path Empty></source>
<translation><ÐÐÑ ÐÑÑÐ></translation>
</message>
@@ -267,22 +343,27 @@
<context>
<name>CircuitListWidget</name>
<message>
+ <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
<source>Connection</source>
<translation>ÐÐÐÐÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
<source>Status</source>
<translation>ÐÐÑÑÐÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/network/circuitlistwidget.cpp" line="56"/>
<source>Close Circuit</source>
<translation>ÐÐÐÑÑÑÑ ÑÐÐÐÑÐÑ</translation>
</message>
<message>
+ <location filename="../gui/network/circuitlistwidget.cpp" line="62"/>
<source>Close Stream</source>
<translation>ÐÐÐÑÑÑÑ ÐÐÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/network/circuitlistwidget.cpp" line="55"/>
<source>Zoom to Circuit</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÑÑÐ</translation>
</message>
@@ -290,38 +371,47 @@
<context>
<name>ConfigDialog</name>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="56"/>
<source>General</source>
<translation>ÐÐÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="59"/>
<source>Server</source>
<translation>ÐÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="65"/>
<source>Advanced</source>
<translation>ÐÐÑÐÐÑÑÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="83"/>
<source>Cancel</source>
<translation>ÐÑÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="62"/>
<source>Appearance</source>
<translation>ÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="78"/>
<source>Save</source>
<translation>ÐÐÑÑÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="154"/>
<source>Error Saving Configuration</source>
<translation>ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.cpp" line="74"/>
<source>Help</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/configdialog.ui" line="289"/>
<source>Settings</source>
<translation>ÐÐÑÑÑÐÐÐÐ</translation>
</message>
@@ -329,10 +419,12 @@
<context>
<name>ControlConnection</name>
<message>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>ÐÐÑ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÐÑÐ.</translation>
</message>
<message>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>ÐÐÑ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÐÑÐ</translation>
</message>
@@ -340,34 +432,42 @@
<context>
<name>ControlSocket</name>
<message>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÐÐÑ Ñ %1:%2 [%3]</translation>
</message>
<message>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>ÐÑÐÐÐÐ ÐÐÐÑÑÑÐÑ ÑÐÐÐÑÐ. [%1]</translation>
</message>
<message>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>ÐÑÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÑÑÐÐÐÐÑÑ. [%1]</translation>
</message>
<message>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>ÐÐÐÐÑ ÐÐÐÑÑÐÑÑ ÐÑÐ ÐÐÐÑÑÐÐ ÑÑÐÐÐÑ ÐÐÐÐÑÑ.</translation>
</message>
<message>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>ÐÑÐÐÐÑÐÑÐ ÐÑÐÐÑ ÐÐÐÑÑÐÐÐÐÑÐ. [%1]</translation>
</message>
<message>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>ÐÐÑ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÐÑÐ.</translation>
</message>
<message>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑ ÐÐÑÑÐÐ ÐÑÐÑÐÐÐÐÐ Tor. ÐÑÐÐÐÑÑÑÐ, ÑÑÐ ÐÐÑÑ ÐÐÐÑÑÐÐÐÐÑÐ Tor ÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ Ð ÐÑ ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐÐÐ ÑÑÐÑÑÑ ÐÐÑÑÐÑ Tor.</translation>
</message>
<message>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia ÐÐÐÐÐÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÑÑÐÑ 1 ÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÑ Tor (ÐÐÐÐÑÑÐÐÐÐ ÐÐÑÑÐÑ %1).
@@ -377,46 +477,57 @@
<context>
<name>GeneralPage</name>
<message>
+ <location filename="../gui/config/generalpage.ui" line="334"/>
<source>Path to Tor's executable</source>
<translation>ÐÑÑÑ Ð ÐÑÐÐÐÐÑÐÐÐÐÑ ÑÐÐÐÑ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="353"/>
<source>Select path to Tor executable</source>
<translation>ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="356"/>
<source>Browse</source>
<translation>ÐÑÐÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="375"/>
<source>Startup Options</source>
<translation>ÐÐÑÐÐ ÐÐÐÑÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="390"/>
<source>Select to start Vidalia on system boot</source>
<translation>ÐÑÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÐÐÐÑÑÐÐÑÑ Vidalia ÐÑÐ ÑÑÐÑÑÐ ÑÐÑÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="393"/>
<source>Run Vidalia on system startup</source>
<translation>ÐÐÐÑÑÐÐÑÑ Vidalia ÐÑÐ ÑÑÐÑÑÐ ÑÐÑÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="406"/>
<source>Set to start Tor when you launch Vidalia</source>
<translation>ÐÑÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÐÐÐÑÑÐÐÑÑ Tor ÐÑÐ ÑÑÐÑÑÐ Vidalia</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="409"/>
<source>Start Tor when Vidalia starts</source>
<translation>ÐÐÐÑÑÐÐÑÑ Tor ÐÑÐ ÑÑÐÑÑÐ Vidalia</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.cpp" line="72"/>
<source>Select Path to Tor</source>
<translation>ÐÑÐÐÑÐÑÐ ÐÑÑÑ Ð Tor</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.ui" line="307"/>
<source>Tor Executable</source>
<translation>ÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/generalpage.cpp" line="63"/>
<source>Executables (*.exe)</source>
<translation>ÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÐÑ (*.exe)</translation>
</message>
@@ -424,26 +535,32 @@
<context>
<name>GraphFrame</name>
<message>
+ <location filename="../gui/bwgraph/graphframe.cpp" line="248"/>
<source>Recv: </source>
<translation>ÐÑ:</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/graphframe.cpp" line="257"/>
<source>Sent: </source>
<translation>ÐÑÑ:</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/graphframe.cpp" line="269"/>
<source>%1 KB</source>
<translation>%1 ÐÐ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/graphframe.cpp" line="272"/>
<source>%1 MB</source>
<translation>%1 ÐÐ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/graphframe.cpp" line="275"/>
<source>%1 GB</source>
<translation>%1 ÐÐ</translation>
</message>
<message>
+ <location filename="../gui/bwgraph/graphframe.cpp" line="296"/>
<source>%1 KB/s</source>
<translation>%1 ÐÐ/Ñ</translation>
</message>
@@ -451,130 +568,162 @@
<context>
<name>HelpBrowser</name>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="303"/>
<source>Vidalia Help</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="449"/>
<source>Find Previous</source>
<translation>ÐÐÐÑÐ ÐÑÐÐÑÐÑÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="462"/>
<source>Find Next</source>
<translation>ÐÐÐÑÐ ÑÐÐÐÑÑÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="496"/>
<source>Case sensitive</source>
<translation>Ð ÑÑÑÑÐÐ ÑÐÐÐÑÑÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="535"/>
<source>Contents</source>
<translation>ÐÐÐÐÑÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="580"/>
<source>Help Topics</source>
<translation>ÐÐÐÑ ÐÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="625"/>
<source>Search</source>
<translation>ÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="680"/>
<source>Found Documents</source>
<translation>ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="759"/>
<source>Back</source>
<translation>ÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="762"/>
<source>Move to previous page (Backspace)</source>
<translation>ÐÐÑÐÑÑÑÑÑ ÐÐ ÐÑÐÐÑÐÑÑÑÑ ÑÑÑÐÐÐÑÑ (Backspace)</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="770"/>
<source>Backspace</source>
<translation>Backspace</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="778"/>
<source>Forward</source>
<translation>ÐÐÐÑÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="781"/>
<source>Move to next page (Shift+Backspace)</source>
<translation>ÐÐÑÐÐÑÐ ÐÐ ÑÐÐÐÑÑÑÑÑ ÑÑÑÐÐÐÑÑ (Shift+Backspace)</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="789"/>
<source>Shift+Backspace</source>
<translation>Shift+Backspace</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="797"/>
<source>Home</source>
<translation>ÐÐÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="800"/>
<source>Move to the Home page (Ctrl+H)</source>
<translation>ÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐÑÑ ÑÑÑÐÐÐÑÑ (Ctrl+H)</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="808"/>
<source>Ctrl+H</source>
<translation>Ctrl+H</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="825"/>
<source>Find</source>
<translation>ÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="828"/>
<source>Search for a word or phrase on current page (Ctrl+F)</source>
<translation>ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐ ÑÑÐÐÑ ÐÐ ÑÐÐÑÑÐÐ ÑÑÑÐÐÐÑÐ (Ctrl+F)</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="836"/>
<source>Ctrl+F</source>
<translation>Ctrl+F</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="844"/>
<source>Close</source>
<translation>ÐÐÐÑÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="847"/>
<source>Close Vidalia Help</source>
<translation>ÐÐÐÑÑÑÑ ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="855"/>
<source>Esc</source>
<translation>Esc</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.cpp" line="121"/>
<source>Error Loading Help Contents: </source>
<translation>ÐÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐÑ ÐÐÐÐÑÐ: </translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.cpp" line="372"/>
<source>Search reached end of document</source>
<translation>ÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.cpp" line="374"/>
<source>Search reached start of document</source>
<translation>ÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐ ÐÐÐÑÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.cpp" line="376"/>
<source>Text not found in document</source>
<translation>ÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="427"/>
<source>Find:</source>
<translation>ÐÐÐÑÐ:</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="506"/>
<source>Whole words only</source>
<translation>ÐÐÐÑÐÐ ÑÐÐÐÐ ÑÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.ui" line="637"/>
<source>Searching for:</source>
<translation>ÐÑÐÐÑÑ:</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.cpp" line="133"/>
<source>Supplied XML file is not a valid Contents document.</source>
<translation>ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ XML ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐÑ.</translation>
</message>
<message>
+ <location filename="../gui/help/browser/helpbrowser.cpp" line="421"/>
<source>Found %1 results</source>
<translation>ÐÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ: %1</translation>
</message>
@@ -582,6 +731,7 @@
<context>
<name>HelpTextBrowser</name>
<message>
+ <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
<source>Error opening help file: </source>
<translation>ÐÑÐÐÐÐ ÐÑÐÑÑÑÐÑ ÑÐÐÐÐ ÐÐÐÐÑÐ: </translation>
</message>
@@ -589,26 +739,32 @@
<context>
<name>LogEvent</name>
<message>
+ <location filename="../control/logevent.cpp" line="68"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
+ <location filename="../control/logevent.cpp" line="69"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
+ <location filename="../control/logevent.cpp" line="70"/>
<source>Notice</source>
<translation>ÐÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../control/logevent.cpp" line="71"/>
<source>Warning</source>
<translation>ÐÑÐÐÑÐÑÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../control/logevent.cpp" line="72"/>
<source>Error</source>
<translation>ÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../control/logevent.cpp" line="73"/>
<source>Unknown</source>
<translation>ÐÐÐÐÐÐÑÑÐÐ</translation>
</message>
@@ -616,10 +772,12 @@
<context>
<name>LogTreeWidget</name>
<message>
+ <location filename="../gui/log/logtreewidget.cpp" line="40"/>
<source>Messages Shown: </source>
<translation>ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ: </translation>
</message>
<message>
+ <location filename="../gui/log/logtreewidget.cpp" line="230"/>
<source>Messages Shown: %1</source>
<translation>ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ: %1</translation>
</message>
@@ -627,126 +785,157 @@
<context>
<name>MainWindow</name>
<message>
+ <location filename="../gui/mainwindow.cpp" line="239"/>
<source>Tor is Stopped</source>
<translation>Tor ÐÑÑÐÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="194"/>
<source>Start</source>
<translation>ÐÐÐÑÑÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="198"/>
<source>Stop</source>
<translation>ÐÑÑÐÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="221"/>
<source>About</source>
<translation>Ð ÐÑÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="202"/>
<source>Exit</source>
<translation>ÐÑÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="205"/>
<source>Bandwidth Graph</source>
<translation>ÐÑÐÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="209"/>
<source>Message Log</source>
<translation>ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="317"/>
<source>Help</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="285"/>
<source>Ctrl+S</source>
<translation>Ctrl+S</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="286"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="287"/>
<source>Ctrl+B</source>
<translation>Ctrl+B</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="288"/>
<source>Ctrl+L</source>
<translation>Ctrl+L</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="290"/>
<source>Ctrl+?</source>
<translation>Ctrl+?</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="302"/>
<source>File</source>
<translation>ÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="305"/>
<source>Tor</source>
<translation>Tor</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="311"/>
<source>View</source>
<translation>ÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="318"/>
<source>Vidalia Help</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="365"/>
<source>Error Starting Tor</source>
<translation>ÐÑÐÐÐÐ ÐÐÐÑÑÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="409"/>
<source>Error Connecting to Tor</source>
<translation>ÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐÐÐÑ Ð Tor</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="470"/>
<source>Error Stopping Tor</source>
<translation>ÐÑÐÐÐÐ ÐÑÑÐÐÐÐÐÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="491"/>
<source>Tor is stopped</source>
<translation>Tor ÐÑÑÐÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="503"/>
<source>Tor Exited</source>
<translation>Tor ÐÐÐÐÑÑÐÐ ÑÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="471"/>
<source>Vidalia was unable to stop Tor.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÑÑÐÐÐÐÐÑÑ Tor.</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="394"/>
<source>Tor is starting</source>
<translation>Tor ÐÐÐÑÑÐÐÐÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="525"/>
<source>Tor is running</source>
<translation>Tor ÐÐÐÑÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="439"/>
<source>Server is Enabled</source>
<translation>ÐÐÑÐÐÑ ÐÐÐÑÑÑÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="467"/>
<source>Tor is stopping</source>
<translation>Tor ÐÑÑÐÐÐÐÐÐÐÐÐÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="289"/>
<source>Ctrl+N</source>
<translation>Ctrl+N</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="533"/>
<source>Error Applying Server Settings</source>
<translation>ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="534"/>
<source>Vidalia was unable to apply your server's settings.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑ ÑÐÑÐÐÑÐ.</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="444"/>
<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>
@@ -755,6 +944,7 @@
ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÑ ÐÐÐÑÑÐÑÐÐ ÐÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ Ð ÐÐÑÑ ÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÑÐÐÑ ÐÐÐÑÐ ÐÑÑÐÐÐ ÑÐÑÐÐÑ?</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="506"/>
<source>Vidalia detected that Tor exited unexpectedly.
Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -763,30 +953,37 @@
ÐÐÐÐÐÑÐÑÑÐ ÐÑÐÐÐÑÑÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÐÑÑÐÐÐÐ, ÑÑÐÐÑ ÑÐÐÐÑÑ ÑÑÐ ÐÑÐÐÐÐÑÐÐ.</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="368"/>
<source>Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÐÐÑÑÑÐÑÑ Tor. ÐÑÐÐÐÑÑÑÐ ÐÐÑÑÑÐÐÐÐ Ð ÑÐÐÐÐÑÐÑÑ ÑÑÐ ÐÐÑ Ð ÐÑÑÑ Ð ÐÑÐÐÐÐÑÐÐÐÐÑ ÑÐÐÐÑ Tor ÑÐÐÐÐÐ ÐÐÑÐÐ.</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="213"/>
<source>Network Map</source>
<translation>ÐÐÑÑÐ ÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="217"/>
<source>Settings</source>
<translation>ÐÐÑÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="567"/>
<source>New Identity</source>
<translation>ÐÐÐÑÐ ÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="291"/>
<source>Ctrl+I</source>
<translation>Ctrl+I</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="570"/>
<source>All subsequent connections will appear to be different than your old connections.</source>
<translation>ÐÑÐ ÐÐÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÑ ÑÐÑÐÐÐÑ Ñ ÐÑÐÐÑÐÑÑÐÐÐ ÑÐÐÐÐÐÐÐÐÑÐÐ.</translation>
</message>
<message>
+ <location filename="../gui/mainwindow.cpp" line="589"/>
<source>Failed to Create New Identity</source>
<translation>ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑ ÐÐÐÐÐÐ ÐÐÐÐ</translation>
</message>
@@ -794,170 +991,211 @@
<context>
<name>MessageLog</name>
<message>
+ <location filename="../gui/log/messagelog.ui" line="289"/>
<source>Message Log</source>
<translation>ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="336"/>
<source>Time</source>
<translation>ÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="341"/>
<source>Type</source>
<translation>ÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="346"/>
<source>Message</source>
<translation>ÐÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="646"/>
<source>Browse</source>
<translation>ÐÑÐÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="430"/>
<source>Saves the current Message Log settings</source>
<translation>ÐÐÑÑÐÐÐÑÑ ÑÐÐÑÑÐÐ ÐÐÑÑÑÐÐÐÐ ÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="433"/>
<source>Save Settings</source>
<translation>ÐÐÑÑÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="449"/>
<source>Cancels changes made to settings</source>
<translation>ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="452"/>
<source>Cancel</source>
<translation>ÐÑÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="466"/>
<source>Message Filter</source>
<translation>ÐÐÐÑÑÑ ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="487"/>
<source>Error</source>
<translation>ÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="503"/>
<source>Warning</source>
<translation>ÐÑÐÐÑÐÑÐÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="519"/>
<source>Notice</source>
<translation>ÐÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="535"/>
<source>Info</source>
<translation>Info</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="551"/>
<source>Debug</source>
<translation>Debug</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="727"/>
<source>Message Filters...</source>
<translation>ÐÐÐÑÑÑÑ ÑÐÐÐÑÐÐÐÐ...</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="730"/>
<source>Set message filters</source>
<translation>ÐÑÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="743"/>
<source>History Size...</source>
<translation>ÐÐÐÐÐÑ ÐÑÑÐÑÐÐ...</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="746"/>
<source>Set maximum number of messages to display</source>
<translation>ÐÑÑÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÑÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐÑ ÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="762"/>
<source>Clear</source>
<translation>ÐÑÐÑÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="765"/>
<source>Clear all messages from the Message Log (Ctrl+E)</source>
<translation>ÐÐÐÐÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐÐÑ ÐÐ ÐÑÑÐÐÐÐ (Ctrl+E)</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="773"/>
<source>Ctrl+E</source>
<translation>Ctrl+E</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="787"/>
<source>Copy</source>
<translation>ÐÐÐÐÑÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="790"/>
<source>Copy the selected messages to the clipboard (Ctrl+C)</source>
<translation>ÐÐÐÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÐÑÑÐÑ ÐÐÐÐÐÐ (Ctrl+C)</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="798"/>
<source>Ctrl+C</source>
<translation>Ctrl+C</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="809"/>
<source>Select All</source>
<translation>ÐÑÐÑÐÑÑ ÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="812"/>
<source>Select all messages (Ctrl+A)</source>
<translation>ÐÑÐÑÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐÐÑ (Ctrl+A)</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="820"/>
<source>Ctrl+A</source>
<translation>Ctrl+A</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="828"/>
<source>Save All</source>
<translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="831"/>
<source>Save all messages to a file</source>
<translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="844"/>
<source>Save Selected</source>
<translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="847"/>
<source>Save selected messages to a file</source>
<translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="901"/>
<source>Close</source>
<translation>ÐÐÐÑÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="904"/>
<source>Close the Message Log</source>
<translation>ÐÐÐÑÑÑÑ ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="912"/>
<source>Esc</source>
<translation>Esc</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="923"/>
<source>Find</source>
<translation>ÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="926"/>
<source>Find all messages containing the search text (Ctrl+F)</source>
<translation>ÐÐÐÑÐ ÐÑÐ ÑÐÐÐÑÐÐÐÑ Ñ ÐÑÐÐÐÑÐ ÑÐÐÑÑÐÐ (Ctrl+F)</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="934"/>
<source>Ctrl+F</source>
<translation>Ctrl+F</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="148"/>
<source>Messages that appear when something has
gone very wrong and Tor cannot proceed.</source>
<translation> ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÑÐÐÑÑÑÑÑ ÐÐÐÐÐ ÑÑÐ-ÑÐ ÐÑÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐ
Ð Tor ÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑ.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="150"/>
<source>Messages that only appear when
something has gone wrong with Tor.</source>
<translation> ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÑÐÐÑÑÑÑÑ ÐÐÐÐÐ
ÑÑÐ-ÑÐ ÐÐ ÑÐÐ Ñ Tor.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="154"/>
<source>Messages that appear infrequently
during normal Tor operation and are
not considered errors, but you may
@@ -968,12 +1206,14 @@
ÑÑÐÑÑ ÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="156"/>
<source>Messages that appear frequently
during normal Tor operation.</source>
<translation> ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÑÐÐÑÑÑÑÑ ÑÐÑÑÐ
ÐÐ ÐÑÐÐÑ ÐÐÑÑÐÐÐ ÑÐÐÐÑÑ Tor.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="158"/>
<source>Hyper-verbose messages primarily of
interest to Tor developers.</source>
<translation> ÐÑÐÐÑ ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ,
@@ -981,66 +1221,82 @@
ÑÐÐÑÐÐÐÑÑÐÐÐÐ Tor.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="203"/>
<source>Error Setting Filter</source>
<translation>ÐÑÐÐÐÐ ÑÑÑÐÐÐÐÐÐ ÑÐÐÑÑÑÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="219"/>
<source>Error Opening Log File</source>
<translation>ÐÑÐÐÐÐ ÐÑÐÑÑÑÐÑ ÑÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="294"/>
<source>Select Log File</source>
<translation>ÐÑÐÐÑÐÑÐ ÑÐÐÐ ÐÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="311"/>
<source>Save Log Messages</source>
<translation>ÐÐÑÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÑ ÐÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="323"/>
<source>Vidalia</source>
<translation>Vidalia</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="376"/>
<source>Find in Message Log</source>
<translation>ÐÐÐÑÐ Ð ÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="377"/>
<source>Find:</source>
<translation>ÐÐÐÑÐ:</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="383"/>
<source>Not Found</source>
<translation>ÐÐ ÐÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="384"/>
<source>Search found 0 matches.</source>
<translation>ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐ.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="863"/>
<source>Settings</source>
<translation>ÐÐÑÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="866"/>
<source>Adjust Message Log Settings</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="874"/>
<source>Ctrl+T</source>
<translation>Ctrl+T</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="882"/>
<source>Help</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="885"/>
<source>Show the help browser</source>
<translation>ÐÑÐÑÑÑÑ ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="204"/>
<source>Vidalia was unable to register for Tor's log events.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÑÑÑÑ ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÑÐÐÐÑÐÐÐÐ Tor.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="324"/>
<source>Cannot write file %1
%2.</source>
@@ -1049,46 +1305,57 @@
%2.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="220"/>
<source>Vidalia was unable to open the specified log file.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÑÐÑÑÑÑ ÑÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÑÐÐÐÐ.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="314"/>
<source>Text Files (*.txt)</source>
<translation>ÐÐÐÑÑÐÐÑÐ ÑÐÐÐÑ (*.txt)</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="893"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="241"/>
<source>Log Filename Required</source>
<translation>ÐÑÐÐÑÐÑÑÑ ÑÐÐÐÐÑÑ ÐÐÑ ÑÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.cpp" line="243"/>
<source>You must enter a filename to be able to save log messages to a file.</source>
<translation>ÐÑ ÐÐÐÐÐÑ ÐÐÐÑÑÐ ÐÐÑ ÑÐÐÐÐ ÑÑÐÐÑ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑÐ ÐÑÑÐÐÐÐ Ð ÑÐÐÐ.</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="567"/>
<source>Message Log History</source>
<translation>ÐÑÑÐÑÐÑ ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="588"/>
<source>Number of messages to display in the message log window</source>
<translation>ÐÐÐÐÑÐÑÑÐÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="612"/>
<source>messages</source>
<translation>ÑÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="631"/>
<source>Always Save New Log Messages</source>
<translation>ÐÑÐÐÐÐ ÑÐÑÑÐÐÑÑÑ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="669"/>
<source>Enable automatically saving all new log messages to a file</source>
<translation>ÐÐÐÑÑÐÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ ÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/log/messagelog.ui" line="672"/>
<source>Automatically save new log messages to a file</source>
<translation>ÐÐÑÑÐÐÑÑÑ Ð ÑÐÐÐ</translation>
</message>
@@ -1096,82 +1363,102 @@
<context>
<name>NetViewer</name>
<message>
+ <location filename="../gui/network/netviewer.ui" line="297"/>
<source>View Tor Network</source>
<translation>ÐÑÐÑÐÐÑÑÐÑÑ ÑÐÑÑ Tor</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="518"/>
<source>Refresh</source>
<translation>ÐÐÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="540"/>
<source>Help</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="562"/>
<source>Close</source>
<translation>ÐÐÐÑÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="584"/>
<source>Zoom In</source>
<translation>ÐÐÐÐÐÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="606"/>
<source>Zoom Out</source>
<translation>ÐÐÐÐÑÑÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="524"/>
<source>Refresh the list of routers and connections</source>
<translation>ÐÐÐÐÐÐÑÑ ÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐ Ð ÑÐÐÐÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="543"/>
<source>Show network map help</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÑ ÐÐ ÐÐÑÑÐ ÑÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="546"/>
<source>Show the network map help</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÑ ÐÐ ÐÐÑÑÐ ÑÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="568"/>
<source>Close the network map</source>
<translation>ÐÐÐÑÑÑÑ ÐÐÑÑÑ ÑÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="590"/>
<source>Zoom in on the network map</source>
<translation>ÐÐÐÐÐÑÐÑÑ ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="612"/>
<source>Zoom out on the network map</source>
<translation>ÐÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="628"/>
<source>Zoom To Fit</source>
<translation>ÐÐÑÐÐÐÐÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="634"/>
<source>Zooms to fit all currently displayed circuits</source>
<translation>ÐÐÐÐÐÑÐÑÑ ÑÐÐ ÑÑÐÐÑ ÐÐÐÐÐÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="532"/>
<source>Ctrl+R</source>
<translation>Ctrl+R</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="554"/>
<source>F1</source>
<translation>F1</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="576"/>
<source>Esc</source>
<translation>Esc</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="598"/>
<source>+</source>
<translation>+</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="620"/>
<source>-</source>
<translation>-</translation>
</message>
<message>
+ <location filename="../gui/network/netviewer.ui" line="642"/>
<source>Ctrl+Z</source>
<translation>Ctrl+Z</translation>
</message>
@@ -1179,10 +1466,12 @@
<context>
<name>Policy</name>
<message>
+ <location filename="../config/policy.cpp" line="178"/>
<source>accept</source>
<translation>ÐÑÐÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../config/policy.cpp" line="178"/>
<source>reject</source>
<translation>ÐÑÐÐÐÐÑÑÑ</translation>
</message>
@@ -1190,14 +1479,17 @@
<context>
<name>RouterDescriptor</name>
<message>
+ <location filename="../control/routerdescriptor.cpp" line="87"/>
<source>Online</source>
<translation>ÐÐÐÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../control/routerdescriptor.cpp" line="89"/>
<source>Hibernating</source>
<translation>ÐÐ ÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../control/routerdescriptor.cpp" line="91"/>
<source>Offline</source>
<translation>ÐÑÐÐÑÑÐÐ</translation>
</message>
@@ -1205,26 +1497,32 @@
<context>
<name>RouterDescriptorView</name>
<message>
+ <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
<source>IP Address:</source>
<translation>IP ÐÐÑÐÑ:</translation>
</message>
<message>
+ <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
<source>Platform:</source>
<translation>ÐÐÐÑÑÐÑÐÐ:</translation>
</message>
<message>
+ <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
<source>Bandwidth:</source>
<translation>ÐÑÐÑÐÐ:</translation>
</message>
<message>
+ <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
<source>Uptime:</source>
<translation>ÐÑÐÐÑ ÑÐÐÐÑÑ:</translation>
</message>
<message>
+ <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
<source>Last Updated:</source>
<translation>ÐÐÐÐÐÐÐÐÐÐ:</translation>
</message>
<message>
+ <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
<source>Location:</source>
<translation>ÐÐÑÑÐÐÐÑÐÐÐÐÐÐÐ:</translation>
</message>
@@ -1232,14 +1530,17 @@
<context>
<name>RouterListItem</name>
<message>
+ <location filename="../gui/network/routerlistitem.cpp" line="94"/>
<source>%1 KB/s</source>
<translation>%1 ÐÐ/Ñ</translation>
</message>
<message>
+ <location filename="../gui/network/routerlistitem.cpp" line="78"/>
<source>Offline</source>
<translation>ÐÑÐÐÑÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/network/routerlistitem.cpp" line="82"/>
<source>Hibernating</source>
<translation>ÐÐ ÐÐÑÐÐÐÐ</translation>
</message>
@@ -1247,14 +1548,17 @@
<context>
<name>RouterListWidget</name>
<message>
+ <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
<source>Server</source>
<translation>ÐÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
<source>Zoom to Server</source>
<translation>ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
<source>%1 servers online (%2 total)</source>
<translation>ÐÐÑÐÐÑÐÐ Ð ÐÐÐÐÐÐÐ - %1 (ÐÑÐÐÐ %2)</translation>
</message>
@@ -1262,86 +1566,107 @@
<context>
<name>ServerPage</name>
<message>
+ <location filename="../gui/config/serverpage.ui" line="502"/>
<source>Check to run as a Tor network server</source>
<translation>ÐÐÐÑÑÐÑÐ ÑÑÐÐÑ ÑÑÐÑÑ ÑÐÑÐÐÑÐÐ ÑÐÑÐ Tor</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="505"/>
<source>Relay traffic for the Tor network</source>
<translation>ÐÐÐÐÐ ÑÐÑÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="716"/>
<source>Directory Port:</source>
<translation>ÐÐÑÑ ÐÐÑÐÐÑÐÑÐÐ:</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="746"/>
<source>Directory Port Number</source>
<translation>ÐÐÐÐÑ ÐÐÑÑÐ ÐÐÑ ÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐÑÐÐ (ÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐ)</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="616"/>
<source>Nickname:</source>
<translation>ÐÐÐ:</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="821"/>
<source>Name of your server</source>
<translation>ÐÐÑ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="684"/>
<source>Contact Info:</source>
<translation>ÐÐÐÑÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐÑ:</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="638"/>
<source>Server Port:</source>
<translation>ÐÐÑÑ ÑÐÑÐÐÑÐ:</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="674"/>
<source>Port on which users and other servers can communicate with your server</source>
<translation>ÐÐÑÑ ÐÐ ÐÐÑÐÑÐÐÑ ÐÑÑÐÐÐ ÐÐÐÐÐÑÑ Ð ÑÐÑÐÐÑÑ ÐÑÐÑÑ ÐÐÐÑÐÐÐÐÐÑÑÑÑÑ Ð ÐÐÑÐÐÑ ÑÐÑÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="565"/>
<source>Address:</source>
<translation>ÐÐÑÐÑ:</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="781"/>
<source>Domain name or IP address of your server</source>
<translation>ÐÐÐÐÐÐÐÐ ÐÐÑ ÐÐÐ IP ÐÐÑÐÑ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="837"/>
<source>Enable to mirror the server directory</source>
<translation>ÐÐÐÑÑÐÑÐ ÑÑÐÐÑ ÐÐÑÐÐÐÐÑÐÐÐÑÑÑ ÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="840"/>
<source>Mirror the Server Directory </source>
<translation>ÐÐÑÐÐÐÐÑÑ Directory</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="590"/>
<source>Attempts to determine the correct address for your server</source>
<translation>ÐÐÐÑÑÐÑÑÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ ÐÐÑÐÐÐÐÐÑÑ ÐÑÐÐÐÐÑÐÑÐ ÐÐÑÐÑ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="593"/>
<source>Get Address</source>
<translation>ÐÐÐÑÑÐÑÑ ÐÐÑÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1251"/>
<source>Exit Policies</source>
<translation>ÐÐÐÐÑÐÐÐ ÐÑÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1377"/>
<source>Show help topic on exit policies</source>
<translation>ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.cpp" line="148"/>
<source>You must specify at least a server nickname and port.</source>
<translation>ÐÑ ÐÐÐÐÐÑ ÑÐÐÐÐÑÑ ÐÐÐ ÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÐÐÑÐ Ð ÐÐÑÑ.</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.cpp" line="232"/>
<source>Error</source>
<translation>ÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.cpp" line="233"/>
<source>Vidalia was unable to determine your public IP address.</source>
<translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑÑ ÐÐÑ ÐÑÐÐÐÑÐÑÐ IP ÐÐÑÐÑ.</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.cpp" line="250"/>
<source>Vidalia was only able to find a private IP address for your server.
Would you like to access an external service to determine your public IP address?</source>
@@ -1350,14 +1675,17 @@
ÐÐÑÐÑÐ ÐÐ ÐÑ ÐÐÑÐÐÐÐÐÑÑ ÐÐÑ IP ÐÐÑÐÑ Ñ ÐÐÐÐÑÑÑ ÐÐÐÑÐÐÐÐ ÑÐÑÐÐÑÐ?</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="850"/>
<source>When enabled, Vidalia will periodically update your IP address if necessary</source>
<translation>ÐÑÐÐ ÐÐÐÑÑÐÐÐ, Vidalia ÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑÑÑ ÐÐÑ IP ÐÐÑÐÑ ÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="853"/>
<source>Automatically Update</source>
<translation>ÐÐÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="806"/>
<source>Email address at which you may be reached if there is a
problem with your server. You might also include your PGP or GPG
fingerprint.</source>
@@ -1366,122 +1694,152 @@
PGP ÐÐÐ GPG ÐÐÑÑÐ.</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1107"/>
<source>Long-term average bandwidth limit</source>
<translation>ÐÐÐÐÐÐÑÐÐÐÐÐÐÐ ÑÑÑÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1078"/>
<source>Average Rate</source>
<translation>ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1195"/>
<source>KB/s</source>
<translation>ÐÐ/Ñ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1182"/>
<source>Peak bandwidth rate limit</source>
<translation>ÐÐÑÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÑ ÑÑÐÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1153"/>
<source>Maximum Rate</source>
<translation>ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="989"/>
<source>Show help topic on bandwidth rate limits</source>
<translation>ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÐÑ ÐÐ ÐÐÑÐÐÐÑÐÐÐÑ ÑÑÐÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="537"/>
<source>Basic Settings</source>
<translation>ÐÐÐÐÐÑÐ ÐÐÑÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="887"/>
<source>Bandwidth Limits</source>
<translation>ÐÐÑÐÐÐÑÐÐÐÑ ÑÑÐÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="922"/>
<source>For Internet connections with fast download speed but slow upload, please list your upload speed here.</source>
<translation>ÐÐÑ ÐÐÑÐÑÐÐÑ-ÑÐÐÐÐÐÐÐÐÐ Ñ ÐÐÐÑÑÐÐ ÐÑÐÐÑÑÐÐ ÑÐÐÑÐÑÑÑÑ, ÐÐ ÐÐÐÐÐ ÐÑÑÐÐÑÑÐÐ, ÐÐÐÐÐÑÐÑÑÐ ÑÐÐÐÑÐÐÐÑÐ ÐÑÑÐÐÑÑÑÑ.</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="943"/>
<source>Select the entry that most closely resembles your Internet connection</source>
<translation>ÐÑÐÐÑÐÑÐ ÐÑÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐÑÐÐÐÑ ÐÐÑ ÐÐÐÑÐÐÐÑ ÐÐÑÐÐÐ ÑÐÐÐÐÐÐÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="953"/>
<source>Cable/DSL 256 Kbps</source>
<translation></translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="958"/>
<source>Cable/DSL 512 Kbps</source>
<translation></translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="963"/>
<source>Cable/DSL 768 Kbps</source>
<translation></translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="968"/>
<source>T1/Cable/DSL 1.5 Mbps</source>
<translation></translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="973"/>
<source>> 1.5 Mbps</source>
<translation></translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="978"/>
<source>Custom</source>
<translation>ÐÑÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1289"/>
<source>Ports 6660 - 6669 and 6697</source>
<translation>ÐÐÑÑÑ 6660 - 6669 Ð 6697</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1292"/>
<source>Internet Relay Chat (IRC)</source>
<translation></translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1302"/>
<source>Ports 110, 143, 993 and 995</source>
<translation>ÐÐÑÑÑ 110, 143, 993 Ð 995</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1305"/>
<source>Retrieve Mail (POP, IMAP)</source>
<translation>ÐÐÐÑÑÐÐÐÐ ÐÐÑÑÑ (POP, IMAP)</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1315"/>
<source>Ports unspecified by other checkboxes</source>
<translation>ÐÐÑÑÑ ÐÐ ÑÐÐÐÐÐÐÑÐ Ð ÐÑÑÐÐÑ checkbox'ÐÑ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1318"/>
<source>Misc Other Services</source>
<translation>ÐÑÑÐÐÐ ÑÐÑÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1328"/>
<source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
<translation>ÐÐÑÑÑ 706, 1863, 5050, 5190, 5222, 8300 Ð 8888</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1331"/>
<source>Instant Messaging (IM)</source>
<translation>ÐÐÑÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑÐÐ (IM)</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1341"/>
<source>Port 443</source>
<translation>ÐÐÑÑ 443</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1344"/>
<source>Secure Websites (SSL)</source>
<translation>ÐÐÑÐÑÑÐÐÑÐ ÐÐÐ-ÑÐÐÑÑ (SSL)</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1354"/>
<source>Port 80</source>
<translation>ÐÐÑÑ 80</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1357"/>
<source>Websites</source>
<translation>ÐÐÐ-ÑÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1450"/>
<source>What Internet resources should Tor users be able to access from your Tor relay?</source>
<translation>ÐÐÐÐÐ ÐÐÑÐÑÐÐÑ-ÑÐÑÑÑÑÑ ÐÑÐÑÑ ÐÐÑÑÑÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑÐ Tor ÑÐÑÐÐ ÐÐÑ ÑÐÑÐÐÑ?</translation>
</message>
<message>
+ <location filename="../gui/config/serverpage.ui" line="1224"/>
<source>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</source>
<translation>ÐÐÑÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÑÑÐÐÐÑ ÑÑÐÑÐÐÐ ÐÐÐÐÐÐ ÐÑÑÑ ÐÐÐÑÑÐ ÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÑ ÑÑÐÐÐÐÐÐ ÑÑÐÐÐÑ ÑÑÐÑÐÐÐ. ÐÐÐ ÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÑÑ ÐÑÑÑ ÐÐÐÑÑÐ 20 ÐÐ/ÑÐÐ.</translation>
</message>
@@ -1489,34 +1847,42 @@
<context>
<name>Stream</name>
<message>
+ <location filename="../control/stream.cpp" line="110"/>
<source>New</source>
<translation>ÐÐÐÑÐ</translation>
</message>
<message>
+ <location filename="../control/stream.cpp" line="112"/>
<source>Resolving</source>
<translation>ÐÐÑÐÐÐÐÑÐÑÑÑ</translation>
</message>
<message>
+ <location filename="../control/stream.cpp" line="113"/>
<source>Connecting</source>
<translation>ÐÐÐÐÐÐÑÐÑÑÑ</translation>
</message>
<message>
+ <location filename="../control/stream.cpp" line="114"/>
<source>Open</source>
<translation>ÐÑÐÑÑÑÑÐ</translation>
</message>
<message>
+ <location filename="../control/stream.cpp" line="115"/>
<source>Failed</source>
<translation>ÐÐÑÐÐÑÐÑÐ</translation>
</message>
<message>
+ <location filename="../control/stream.cpp" line="116"/>
<source>Closed</source>
<translation>ÐÐÐÑÑÑÑÐ</translation>
</message>
<message>
+ <location filename="../control/stream.cpp" line="118"/>
<source>Unknown</source>
<translation>ÐÐÐÐÐÐÑÑÐÑÐ</translation>
</message>
<message>
+ <location filename="../control/stream.cpp" line="117"/>
<source>Retrying</source>
<translation>ÐÐÐÑÑÐÐ</translation>
</message>
@@ -1524,6 +1890,7 @@
<context>
<name>TorProcess</name>
<message>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>ÐÑÐÑÐÑÑ %1 ÐÐ ÑÐÐÐ ÐÑÑÐÐÐÐÐÑÑÑ. [%2]</translation>
</message>
@@ -1531,53 +1898,65 @@
<context>
<name>TorService</name>
<message>
- <source>Unable to start Tor service.</source>
- <translation>ÐÐ ÐÐÐÑ ÐÐÐÑÑÑÐÑÑ ÑÐÑÐÐÑ Tor.</translation>
- </message>
- <message>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>ÐÐÑÐÐÑ Tor ÐÐ ÑÑÑÐÐÐÐÐÐÐ.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="88"/>
<source>OK</source>
<translation>ÐÐ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="89"/>
<source>Cancel</source>
<translation>ÐÑÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="90"/>
<source>Yes</source>
<translation>ÐÐ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="91"/>
<source>No</source>
<translation>ÐÐÑ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="92"/>
<source>Help</source>
<translation>ÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="93"/>
<source>Retry</source>
<translation>ÐÑÑ ÑÐÐ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="94"/>
<source>Show Log</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÑÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="95"/>
<source>Show Settings</source>
<translation>ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="96"/>
<source>Continue</source>
<translation>ÐÑÐÐÐÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../gui/common/vmessagebox.cpp" line="97"/>
<source>Quit</source>
<translation>ÐÑÐÑÐ</translation>
</message>
@@ -1585,18 +1964,22 @@
<context>
<name>Vidalia</name>
<message>
+ <location filename="../vidalia.cpp" line="230"/>
<source>Invalid language code specified: </source>
<translation>ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐ ÑÐÑÐÐ: </translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="237"/>
<source>Invalid GUI style specified: </source>
<translation>ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÑÑÐÐÑ ÐÐÑÐÑÑÐÐÑÐ: </translation>
</message>
<message>
+ <location filename="../main.cpp" line="86"/>
<source>Vidalia is already running</source>
<translation>Vidalia ÑÐÐ ÐÐÐÑÑÐÐÐ</translation>
</message>
<message>
+ <location filename="../main.cpp" line="92"/>
<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>
@@ -1605,50 +1988,62 @@
ÐÑ ÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐ Vidalia?</translation>
</message>
<message>
+ <location filename="../main.cpp" line="72"/>
<source>Invalid Argument</source>
<translation>ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑ</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="161"/>
<source>Displays this usage message and exits.</source>
<translation>ÐÐÐÐÐÑÐÐÐÑ ÑÑÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÑÐÐÐÑÐÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÐÑ ÑÐÐÐÑÑ.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="163"/>
<source>Resets ALL stored Vidalia settings.</source>
<translation>ÐÐÑÐÑÑÐÐÐÑ ÐÐÐ ÑÐÑÑÐÐÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ Vidalia.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="165"/>
<source>Sets the directory Vidalia uses for data files.</source>
<translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐ Vidalia ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÑ ÑÐÐÐÐÐ ÐÐÐÐÑÑ.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="167"/>
<source>Sets the name and location of Vidalia's pidfile.</source>
<translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÐÐÑ Ð ÐÑÑÑ Ð ÑÐÐÐÑ Ñ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑÑÐ Vidalia.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="169"/>
<source>Sets the name and location of Vidalia's logfile.</source>
<translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÐÐÑ Ð ÐÑÑÑ Ð ÑÐÐÐÑ ÐÑÑÐÐÐÐ Vidalia.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="172"/>
<source>Sets the verbosity of Vidalia's logging.</source>
<translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÑÑÐÐÐÐÑ ÑÐÐÐÑÐÐÐÐ (verbosity) Vidalia.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="175"/>
<source>Sets Vidalia's interface style.</source>
<translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÑÑÐÐÑ ÐÐÑÐÑÑÐÐÑÐ Vidalia.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="178"/>
<source>Sets Vidalia's language.</source>
<translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÑÐÑÐ Vidalia.</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="182"/>
<source>Vidalia Usage Information</source>
<translation>ÐÐÑÐÑÐÐÑÐÑ Ð ÐÑÐÐÐÑÐÐÐÐÐÐÐ Vidalia</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="243"/>
<source>Invalid log level specified: </source>
<translation> ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÑÑÐÐÐÐÑ ÑÐÐÐÑÐÐÐÐ:</translation>
</message>
<message>
+ <location filename="../vidalia.cpp" line="249"/>
<source>Unable to open log file '%1': %2</source>
<translation>ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÑÐÐÐ '%1': %2</translation>
</message>
Modified: trunk/src/lang/vidalia_zh-cn.ts
===================================================================
--- trunk/src/lang/vidalia_zh-cn.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_zh-cn.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,127 +59,142 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>æåçå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>äçæåçéçæäåå Tor (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>èéæ Tor éçæäçèå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>æè</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>æé</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>ääääçæèè:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia åääçèçæçæéèè</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>ääääçæçèè:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia åääçèçæççæéèè</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>èéæ Tor éçæä</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>ææåèæä</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 äåå.èéæåèååèæä?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>ååæäåè</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>ææåå %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>æå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>åè Tor ää Windows ççæåèè,èåçèé</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>ää Windows ååççæåèè Tor (åå"æå"äèèèå)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>ææçé Tor æå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>ææåè Tor æå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia ææåè Tor äççæå.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
<translation>Vidalia ææçé Tor æå.èæåçé(æççèæå).</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Tor éçæä</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>èæå Vidalia çäå Tor èèéèççå.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -402,12 +417,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>æåæåååæèæ.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>æåæåæèæ</translation>
</message>
@@ -415,42 +430,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>èæå %1:%2 åçéè. [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>æåæåèææåçéè. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>åéæååäæåçéè. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>ååèèåææææåæåæåèæ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>æææååå. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>æåæåååæèæ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia ææåå Tor çæååèçæ.èæææåçåèåäå Tor çæ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia äææçæ 1 ç Tor æååè (ææåçæ: %1).èåçåææçæç Tor çå.</translation>
@@ -1854,7 +1869,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>èç %1 åæåè. [%2]</translation>
</message>
@@ -1862,15 +1877,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>ææåå Tor æå.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>æåè Tor æå.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>
Modified: trunk/src/lang/vidalia_zh-tw.ts
===================================================================
--- trunk/src/lang/vidalia_zh-tw.ts 2007-03-11 01:14:34 UTC (rev 1666)
+++ trunk/src/lang/vidalia_zh-tw.ts 2007-03-11 01:14:46 UTC (rev 1667)
@@ -59,127 +59,142 @@
<context>
<name>AdvancedPage</name>
<message>
- <location filename="../gui/config/advancedpage.ui" line="301"/>
+ <location filename="../gui/config/advancedpage.ui" line="502"/>
<source>Control Port</source>
<translation>æååå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="341"/>
+ <location filename="../gui/config/advancedpage.ui" line="576"/>
<source>9051</source>
<translation>9051</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="390"/>
+ <location filename="../gui/config/advancedpage.ui" line="625"/>
<source>Start Tor with the specified configuration file (torrc)</source>
<translation>äçæåçéçææåå Tor (torrc)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="409"/>
+ <location filename="../gui/config/advancedpage.ui" line="644"/>
<source>Select path to Tor configuration file</source>
<translation>èéå Tor éçææçèå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="412"/>
+ <location filename="../gui/config/advancedpage.ui" line="647"/>
<source>Browse</source>
<translation>çè</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="431"/>
+ <location filename="../gui/config/advancedpage.ui" line="666"/>
<source>Permissions</source>
<translation>æé</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="454"/>
+ <location filename="../gui/config/advancedpage.ui" line="689"/>
<source>Run as User:</source>
<translation>äçääçæåè:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="467"/>
+ <location filename="../gui/config/advancedpage.ui" line="702"/>
<source>Vidalia will run with this User's permissions</source>
<translation>Vidalia åæäçèçæçæéåè</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="487"/>
+ <location filename="../gui/config/advancedpage.ui" line="722"/>
<source>Run as Group:</source>
<translation>äçääçæççåè:</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="494"/>
+ <location filename="../gui/config/advancedpage.ui" line="729"/>
<source>Vidalia will run with this Group's permissions</source>
<translation>Vidalia åæäçèçæçççæéåè</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="107"/>
+ <location filename="../gui/config/advancedpage.cpp" line="119"/>
<source>Select Tor Configuration File</source>
<translation>èéå Tor éçææ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="120"/>
+ <location filename="../gui/config/advancedpage.cpp" line="132"/>
<source>File Not Found</source>
<translation>ææåèææ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="122"/>
+ <location filename="../gui/config/advancedpage.cpp" line="134"/>
<source>%1 does not exist. Would you like to create it?</source>
<translation>%1 äåå.èåæåèååèææ?</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="133"/>
+ <location filename="../gui/config/advancedpage.cpp" line="145"/>
<source>Failed to Create File</source>
<translation>ååææåæ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="134"/>
+ <location filename="../gui/config/advancedpage.cpp" line="146"/>
<source>Unable to create %1 [%2]</source>
<translation>çæåå %1 [%2]</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="515"/>
+ <location filename="../gui/config/advancedpage.ui" line="753"/>
<source>Service</source>
<translation>æå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="530"/>
+ <location filename="../gui/config/advancedpage.ui" line="768"/>
<source>Enable this if you wish to run Tor as a Windows service</source>
<translation>åè Tor äç Windows ççæååè,èåçèé</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="533"/>
+ <location filename="../gui/config/advancedpage.ui" line="771"/>
<source>Run Tor in the background as a Windows service</source>
<translation>äç Windows ååççæååè Tor (åå"æå"äéèèå)</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="157"/>
+ <location filename="../gui/config/advancedpage.cpp" line="169"/>
<source>Unable to remove Tor Service</source>
<translation>çæçé Tor æå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="168"/>
+ <location filename="../gui/config/advancedpage.cpp" line="180"/>
<source>Unable to install Tor Service</source>
<translation>çæåè Tor æå</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="169"/>
+ <location filename="../gui/config/advancedpage.cpp" line="181"/>
<source>Vidalia was unable to install the Tor service.</source>
<translation>Vidalia çæåè Tor çççæå.</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.cpp" line="159"/>
+ <location filename="../gui/config/advancedpage.cpp" line="171"/>
<source>Vidalia was unable to remove the Tor service.
You may need to remove it manually.</source>
<translation>Vidalia çæçé Tor æå.èæåçé(æççèæå).</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="369"/>
+ <location filename="../gui/config/advancedpage.ui" line="604"/>
<source>Tor Configuration File</source>
<translation>Tor éçææ</translation>
</message>
<message>
- <location filename="../gui/config/advancedpage.ui" line="338"/>
+ <location filename="../gui/config/advancedpage.ui" line="573"/>
<source>Port that Vidalia uses to communicate with Tor.</source>
<translation>èæå Vidalia çæå Tor éèéèçåå.</translation>
</message>
+ <message>
+ <location filename="../gui/config/advancedpage.cpp" line="80"/>
+ <source>'%1' is not a valid IP address.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="542"/>
+ <source>IP address on which Tor is listening for controller connections.</source>
+ <translation type="unfinished"></translation>
+ </message>
+ <message>
+ <location filename="../gui/config/advancedpage.ui" line="549"/>
+ <source>:</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>AppearancePage</name>
@@ -402,12 +417,12 @@
<context>
<name>ControlConnection</name>
<message>
- <location filename="../control/controlconnection.cpp" line="285"/>
+ <location filename="../control/controlconnection.cpp" line="294"/>
<source>Control socket is not connected.</source>
<translation>æåæåçåæéæ.</translation>
</message>
<message>
- <location filename="../control/controlconnection.cpp" line="232"/>
+ <location filename="../control/controlconnection.cpp" line="239"/>
<source>Control socket is not connected</source>
<translation>æåæåæéæ</translation>
</message>
@@ -415,42 +430,42 @@
<context>
<name>ControlSocket</name>
<message>
- <location filename="../control/controlsocket.cpp" line="61"/>
+ <location filename="../control/controlsocket.cpp" line="65"/>
<source>Error connecting to %1:%2 [%3]</source>
<translation>éæå %1:%2 ççéè. [%3]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="95"/>
+ <location filename="../control/controlsocket.cpp" line="101"/>
<source>Error disconnecting socket. [%1]</source>
<translation>æéæåéææççéè. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="151"/>
+ <location filename="../control/controlsocket.cpp" line="159"/>
<source>Error sending control command. [%1]</source>
<translation>çéæåæäæççéè. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="188"/>
+ <location filename="../control/controlsocket.cpp" line="196"/>
<source>Socket disconnected while attempting to read a line of data.</source>
<translation>çåèèåèæææåæéæåéæ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="226"/>
+ <location filename="../control/controlsocket.cpp" line="234"/>
<source>Invalid control reply. [%1]</source>
<translation>çææååæ. [%1]</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="142"/>
+ <location filename="../control/controlsocket.cpp" line="150"/>
<source>Control socket is not connected.</source>
<translation>æåæåçåæéæ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="76"/>
+ <location filename="../control/controlsocket.cpp" line="81"/>
<source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
<translation>Vidalia çæåå Tor çæåååçæ.èæææåååèåäå Tor çæ.</translation>
</message>
<message>
- <location filename="../control/controlsocket.cpp" line="80"/>
+ <location filename="../control/controlsocket.cpp" line="85"/>
<source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
Upgrade to a newer version of Tor.</source>
<translation>Vidalia åææçæ 1 ç Tor æååå (ææåçæ: %1).èåçåææçæç Tor çå.</translation>
@@ -1854,7 +1869,7 @@
<context>
<name>TorProcess</name>
<message>
- <location filename="../control/torprocess.cpp" line="88"/>
+ <location filename="../control/torprocess.cpp" line="93"/>
<source>Process %1 failed to stop. [%2]</source>
<translation>éç %1 åæåæ. [%2]</translation>
</message>
@@ -1862,15 +1877,15 @@
<context>
<name>TorService</name>
<message>
- <location filename="../control/torservice.cpp" line="168"/>
- <source>Unable to start Tor service.</source>
- <translation>çæåå Tor æå.</translation>
- </message>
- <message>
- <location filename="../control/torservice.cpp" line="152"/>
+ <location filename="../control/torservice.cpp" line="155"/>
<source>The Tor service is not installed.</source>
<translation>æåè Tor æå.</translation>
</message>
+ <message>
+ <location filename="../control/torservice.cpp" line="173"/>
+ <source>Unable to start the Tor service.</source>
+ <translation type="unfinished"></translation>
+ </message>
</context>
<context>
<name>VMessageBox</name>