[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]

[vidalia-svn] r1698: lupdate the translations, finally; I don't think the new dia (in trunk: . src/lang)



Author: edmanm
Date: 2007-04-08 03:06:12 -0400 (Sun, 08 Apr 2007)
New Revision: 1698

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:
 r1778@adrastea:  edmanm | 2007-04-08 03:00:21 -0400
 lupdate the translations, finally; I don't think the new dialog text will 
 change too much.



Property changes on: trunk
___________________________________________________________________
 svk:merge ticket from /vidalia/local/trunk [r1778] on 54b3572a-7227-0410-958f-53ecd705b71a

Modified: trunk/src/lang/vidalia_bg.ts
===================================================================
--- trunk/src/lang/vidalia_bg.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_bg.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -784,155 +784,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation type="unfinished">ÐÐÑ Ð ÑÐÑÑÐ</translation>
+        <translation type="obsolete">ÐÐÑ Ð ÑÐÑÑÐ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>ÐÑÐÑÑ</translation>
+        <translation type="obsolete">ÐÑÐÑÑ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>ÐÑÐÐ</translation>
+        <translation type="obsolete">ÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>ÐÑÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>ÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐÑÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>ÐÑÐÐÑÐÐÐÑ ÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>ÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>ÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>ÐÐÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>ÐÐÐÐÐÐÐ ÐÐÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÐÐ Ñ ÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÐÐÐ ÐÐ ÐÐÑ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation type="unfinished">ÐÐÑ Ð ÑÐÑÑÐ</translation>
+        <translation type="obsolete">ÐÐÑ Ð ÑÐÑÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>ÐÐÑÐÐ ÐÑ ÐÐÑ ÑÑÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÑ ÐÐ ÑÐÑÐ ÐÐÑ.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation type="unfinished">ÐÐÑ ÑÑÐÑÑÐÑÐ</translation>
+        <translation type="obsolete">ÐÐÑ ÑÑÐÑÑÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation type="unfinished">ÐÐÑ ÑÐÐÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>ÐÑÑÐÑÑÑÑ Ð ÐÐÐÑÑÐÐ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation type="unfinished">ÐÐÑ ÑÐÐÑÐ</translation>
+        <translation type="obsolete">ÐÐÑ ÑÐÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÑ ÐÐ ÐÑÐÐÐÐÐ ÑÐÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new server?</source>
@@ -941,7 +941,7 @@
 ÐÐÑÑÐ ÐÐ ÐÐÐÐÐÐ ÐÐ ÐÑÐÐÑÑÐÐÑÐ ÐÑÐÑÑÑÐÐ, ÐÐÐÐÐÐÐ ÐÑÐÐÐ ÐÐ ÐÐÐÐÐÑÐÑÐ ÐÐ ÐÐÐÐÑÑÑ ÐÐÐ ÑÑÑÐÑÑ?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -950,40 +950,155 @@
 ÐÐÐÑ ÐÑÐÐÐÑÐÑÐ ÐÐÐ ÑÐÐÐÐ ÑÑÑ ÑÑÐÐÑÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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>ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÑ ÐÐ ÑÑÐÑÑÐÑÐ ÐÐÑ. ÐÑÐÐÐÑÐÑÐ ÐÐÑÐÐÑÐ ÑÐ ÐÐ ÐÐ ÐÑÐÐÐÑÐÑÐ ÐÐÐÐ Ð ÐÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐÐ ÐÐÑÑÐÐÐÐÐÐÐÐÐÐÑÐ ÐÐ ÐÐÑ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>ÐÐÑÑÐ ÐÑÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>ÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>ÐÐÐÐ ÑÐÐÐÐÐÑÐÐÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>ÐÐÑÑÐÐÑ ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÐÑÑ</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_de.ts
===================================================================
--- trunk/src/lang/vidalia_de.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_de.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -787,155 +787,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>Tor gestoppt</translation>
+        <translation type="obsolete">Tor gestoppt</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>Start</translation>
+        <translation type="obsolete">Start</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>Stop</translation>
+        <translation type="obsolete">Stop</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Ãber</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreitengraph</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Nachrichtenprotokoll</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Strg+S</translation>
+        <translation type="obsolete">Strg+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Strg+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Strg+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Strg+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Strg+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Vidalia Hilfe</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Fehler beim Starten von Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Fehler bei der Verbindung zu Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Fehler beim Stoppen von Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>Tor angehalten</translation>
+        <translation type="obsolete">Tor angehalten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor beendet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia konnte Tor nicht anhalten.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>Tor startet</translation>
+        <translation type="obsolete">Tor startet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>Tor lÃuft</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>Server ist eingeschalten</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>Tor stoppt</translation>
+        <translation type="obsolete">Tor stoppt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Fehler beim Anwenden der Servereinstellungen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia konnte die Servereinstellungen nicht anwenden.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -945,7 +945,7 @@
 Wollen Sie den Server vorsichtig beenden, um Clients Zeit zu geben einen neuen Server zu finden?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -954,41 +954,156 @@
 ÃberprÃfen Sie das Nachrichtenprotokoll auf weitere Informationen.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 konnte Tor nicht starten. ÃberprÃfen Sie Ihre Einstellungen, um sicherzustellen, dass der Pfad zur Tor-Anwendung korrekt angegeben ist.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Netzwerk-Karte</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Neue IdentitÃt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Strg+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>Alle folgenden Verbindungen werden anders als alte
 Verbindungen erscheinen.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>Konnte keine neue IdentitÃt erstellen</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_en.ts
===================================================================
--- trunk/src/lang/vidalia_en.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_en.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -782,204 +782,284 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="194"/>
-        <source>Start</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="198"/>
-        <source>Stop</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="285"/>
-        <source>Ctrl+S</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new server?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="239"/>
-        <source>Tor is Stopped</source>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <source>Tor is running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="467"/>
-        <source>Tor is stopping</source>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="394"/>
-        <source>Tor is starting</source>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="491"/>
-        <source>Tor is stopped</source>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
-        <source>Tor is running</source>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_es.ts
===================================================================
--- trunk/src/lang/vidalia_es.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_es.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -786,155 +786,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation type="unfinished">Tor esta Detenido</translation>
+        <translation type="obsolete">Tor esta Detenido</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>Iniciar</translation>
+        <translation type="obsolete">Iniciar</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>Detener</translation>
+        <translation type="obsolete">Detener</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>GrÃfica de Ancho de Banda</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Informe de Mensajes</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Ayuda de Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Error al Iniciar Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Error Conectando a Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Error Deteniendo Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation type="unfinished">Tor esta detenido</translation>
+        <translation type="obsolete">Tor esta detenido</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor ha Salido</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia no pudo detener Tor.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation type="unfinished">Tor esta iniciando</translation>
+        <translation type="obsolete">Tor esta iniciando</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation type="unfinished">Tor esta ejecutandose</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>Servidor esta Habilitado</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation type="unfinished">Tor esta deteniendose</translation>
+        <translation type="obsolete">Tor esta deteniendose</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Error Aplicando Preferencias del Servidor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia no pudo aplicar las preferencias de su servidor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -943,7 +943,7 @@
 ÂDesea apagar cuidadosamente y dar a los clientes tiempo para encontrar un nuevo servidor?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -952,40 +952,155 @@
 Por favor verifique el registro de mensajes para indicadores de que paso con Tor antes de cerrar.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 no pudo iniciar Tor. Verifique sus preferencias para asegurar el nombre correcto y la localizaciÃn del ejecutable Tor que esta especificado.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Mapa de Red</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Nueva Identidad</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>Todas las conexiones subsequentes aparecerÃn diferente que sus conexiones antiguas.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>Fallà en Crear Nueva Identidad</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_fa.ts
===================================================================
--- trunk/src/lang/vidalia_fa.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_fa.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -784,202 +784,317 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>ØØÙØ</translation>
+        <translation type="obsolete">ØØÙØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>ØÙÙÙ</translation>
+        <translation type="obsolete">ØÙÙÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>ØØØØØÙâÛ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>ØØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>ÙÙÙØØØ ÙÙÙØÛâØØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>ÚØØØØ ÙÛØÙâÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>ØØÙÙÙØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>ÚÙØØÙ + S</translation>
+        <translation type="obsolete">ÚÙØØÙ + S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>ÚÙØØÙ + T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>ÚÙØØÙ + B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>ÚÙØØÙ + L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>ÚÙØØÙ + ?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>ÙØÛÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>ÙÙØÛØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>ØØÙÙÙØÛ ÙÛØØÙÛØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>ØØØ ØØ ØØÙâØÙØØØÛ ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>ØØØ ØØ ØØØØÙ ØÙ ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>ØØØ ØØ ØÙÙÙ ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>ØÙØ ØØØÙÙ ÙÛØØ ÚØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>ÙÛØØÙÛØ ÙØÙØÙØØ ØÙØ ØØ ÙØÙÙÙ ÚÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>ØØÙØ ÙØØÙ ØØÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>ÚÙØØÙ + N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>ØØÙØÙ ØÙØÛÙØØ ØØÙØ ØØ ØØØ ÙÙØØÙ ØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>ÙÛØØÙÛØ ÙØÙØÙØØ ØÙØÛÙØØ ØÙØ ØØØÛ ØØÙØ ØØ ØØÙØÙ ÚÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new server?</source>
         <translation>ØÙØ ØØ ØØÙ ØØØØ ÛÚ ØØÙØ ØØ ØØÙ ØØØØ ØØØÛØ. ØØØÙÙ ØØØÙ ØÙ ÚØØ ØØÙØ ØÙØÙ ØØØØÙØØ ÚØØØØØÙ ØØ ÙØØÙ ØÙØÙØ ÚØØ. ØÛØ ÙØÛÙ ÙØØÛØ ØÙ ÚØØØØØÙ ÚÙÛ ÙØØØ ØÙÛØ ØØ ØØÙØ ØÛÚØÛ ÙÛØØ ÚÙÙØ Ù ØÙÚØÙ ØØÙØ ØØ ØØÙÙØ ÚÙÛØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
         <translation>  ÙÛØØÙÛØ ÙØÙØÙ ØØÙ ÚÙ ØÙØ ØÙ ØÙØØ ØÛØÙÙØØØÙâØÛ ØØØÙÙ ÙÛØØ ÚØØÙâØØØ. ÙØÙØ ÚØØØØ ÙÛØÙâÙØ ØØ ØØØÛ ÛØÙØÙ ØÙØ ØØØÙÙâÛ ØÙØ ØØØØÛ ÚÙÛØ. </translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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>ÙÛØØÙÛØ ÙØÙØÙØØ ØÙØ ØØ ØØÙâØÙØØØÛ ÚÙØ. ØÙØÛÙØØ ØÙØ ØØ ØÙØØØÙ ØØØØÛ ÚÙÛØ ØØ ÙØÙØÙ ØÙÛØ ÙØÛØ ÙØÛÙ ØØØØÛÛ ØØ ØØ ØØØØ ÙØØØ ÚØØÙâØÛØ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>ÙÙØÙâÛ ØØÚÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>ØÙØÛÙØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>ÙÙÛØ ØØÛØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>ÚÙØØÙ + I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>ØÛØØØ ÙÙÛØ ØØÛØ ØÙ ØÚØØ ØÙØØÙÛØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>ØÙØ ÙØÙÙÙ ØØÙ</translation>
+        <translation type="obsolete">ØÙØ ÙØÙÙÙ ØØÙ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>ØÙØ ØØ ØØÙ ØÙÙÙ ØØØ</translation>
+        <translation type="obsolete">ØÙØ ØØ ØØÙ ØÙÙÙ ØØØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>ØÙØ ØØ ØØÙ ØØÙØ ØÙ ÚØØ ØØØ</translation>
+        <translation type="obsolete">ØÙØ ØØ ØØÙ ØØÙØ ØÙ ÚØØ ØØØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>ØÙØ ÙØÙÙÙ ØØÙ</translation>
+        <translation type="obsolete">ØÙØ ÙØÙÙÙ ØØÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>ØÙØ ØØ ØØÙ ØØØØ ØØØ</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_fi.ts
===================================================================
--- trunk/src/lang/vidalia_fi.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_fi.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -787,155 +787,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>Tor on pysÃhtynyt</translation>
+        <translation type="obsolete">Tor on pysÃhtynyt</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>KÃynnistÃ</translation>
+        <translation type="obsolete">KÃynnistÃ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>PysÃytÃ</translation>
+        <translation type="obsolete">PysÃytÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Tietoa Vidaliasta</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>YhteydenkÃyttÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Tapahtumaloki</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Ohje</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>NÃytÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Vidalian ohje</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Virhe Tor-ohjelman kÃynnistymisessÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Virhe yhdistettÃessà Tor-ohjelmaan</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Virhe Tor-ohjelman pysÃhtymisessÃ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>Tor on pysÃhtynyt</translation>
+        <translation type="obsolete">Tor on pysÃhtynyt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor yllÃttÃen pysÃhtyi</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia ei onnistunut pysÃyttÃmÃÃn Tor-ohjelmaa</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>Tor kÃynnistyy</translation>
+        <translation type="obsolete">Tor kÃynnistyy</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>Tor on pÃÃllÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>Palvelin on kÃytÃssÃ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>PysÃytetÃÃn Tor</translation>
+        <translation type="obsolete">PysÃytetÃÃn Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Virhe palvelinasetusten kÃyttÃÃnottamisessa</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia ei onnistunut ottamaan kÃyttÃÃn palvelimesi asetuksia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -944,7 +944,7 @@
 Haluaisitteko sulkea turvallisesti ja antaen kÃyttÃjille aikaa lÃytÃÃ uuden palvelimen?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,40 +953,155 @@
 Ole hyvà ja tarkista tapahtumalokista mità tapahtui Tor-ohjelmalle ennen pysÃhtymistÃ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 ei onnistunut kÃynnistÃmÃÃn Tor-ohjelmaa. Tarkista asetuksista onko Tor-ohjelman nimi ja sijainti oikein kirjoitettu.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Verkkokartta</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Uusi identiteetti</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>Seuraavat yhteydet tulevat olemaan erilaiset kuin vanhat.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>Uuden identiteetin luominen epÃonnistui</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_fr.ts
===================================================================
--- trunk/src/lang/vidalia_fr.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_fr.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -787,155 +787,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>Tor est arrÃtÃ</translation>
+        <translation type="obsolete">Tor est arrÃtÃ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>DÃmarrer</translation>
+        <translation type="obsolete">DÃmarrer</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>ArrÃter</translation>
+        <translation type="obsolete">ArrÃter</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Ã propos</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>Graphe bande passante</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Journal des messages</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>AperÃu</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Aide de Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Erreur de dÃmarrage Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Erreur de connexion à Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Erreur d&apos;arrÃt Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>Tor est arrÃtÃ</translation>
+        <translation type="obsolete">Tor est arrÃtÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor a Ãtà quittÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia n&apos;a pas pu arrÃter Tor.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>Tor est en cours de dÃmarrage</translation>
+        <translation type="obsolete">Tor est en cours de dÃmarrage</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>Tor est actif</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>Le serveur est activÃ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>Tor est en cours d&apos;arrÃt</translation>
+        <translation type="obsolete">Tor est en cours d&apos;arrÃt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Erreur en appliquant les options du serveur</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia n&apos;a pas pu appliquer les options du serveur.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -944,7 +944,7 @@
 Voulez-vous arrÃter de maniÃre graduelle afin de donner le temps aux clients Tor de trouver un nouveau serveur ?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,40 +953,155 @@
 Veuillez consulter le journal des messages afin de vÃrifier ce qui est arrivà à Tor avant son arrÃt.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 n&apos;a pas pu dÃmarrer Tor. ContrÃlez vos options et assurez-vous que le nom et le chemin de l&apos;exÃcutable de Tor sont correctement indiquÃs.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>ParamÃtres</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Voir rÃseau Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Nouvelle identitÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>Toutes les connexions suivantes sembleront Ãtre diffÃrentes des prÃcÃdentes.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>La crÃation d&apos;une nouvelle identità a ÃchouÃ</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_hu.ts
===================================================================
--- trunk/src/lang/vidalia_hu.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_hu.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -787,156 +787,156 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation type="unfinished">A Tor le van ÃllÃtva</translation>
+        <translation type="obsolete">A Tor le van ÃllÃtva</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>ElindÃtÃs</translation>
+        <translation type="obsolete">ElindÃtÃs</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>LeÃllÃtÃs</translation>
+        <translation type="obsolete">LeÃllÃtÃs</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>NÃvjegy</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>KilÃpÃs</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>SÃvszÃlessÃg grafikon</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Log Ãzenetek</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>SÃgÃ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>FÃjl</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>NÃzet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Vidalia sÃgÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Hiba a Tor indÃtÃsÃval</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Hiba a Tor-hoz kapcsolÃdÃssal</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Hiba a Tor leÃllÃtÃsÃval</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation type="unfinished">A Tor leÃllt</translation>
+        <translation type="obsolete">A Tor leÃllt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>A Tor bezÃrÃdott</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>A Vidalia nem tudta leÃllÃtani a Tor-t.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation type="unfinished">A Tor elindul</translation>
+        <translation type="obsolete">A Tor elindul</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation type="unfinished">A Tor fut</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>A szerver bekapcsolva</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation type="unfinished">A Tor leÃll</translation>
+        <translation type="obsolete">A Tor leÃll</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Hiba a szerver beÃllÃtÃsainak mentÃsÃben</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>A Vidalia nem tudta ÃrvÃnyesÃteni a szerver
 beÃllÃtÃsait.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -947,7 +947,7 @@
 Ãjabb szerverek megtalÃlÃsÃra?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -958,43 +958,158 @@
 esemÃnyekre utalà jeleket keresve.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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>A Vidalia nem tudta elindÃtani a Tor-t. EllenÃrizd
 a beÃllÃtÃsaidat, hogy jÃl van-e megadva a Tor futtathatà ÃllomÃnyÃnak neve Ãs elÃrÃsi
 Ãtja.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation type="unfinished">BeÃllÃtÃsok</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation type="unfinished">Ãj identitÃs</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation type="unfinished">Minden tovÃbbi kapcsolat a rÃgi kapcsolataidtÃl
 kÃlÃnbÃzÃkÃnt fog szerepelni.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation type="unfinished">Nem sikerÃlt az Ãj identitÃs lÃtrehozÃsa</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_it.ts
===================================================================
--- trunk/src/lang/vidalia_it.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_it.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -786,155 +786,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation type="unfinished">Tor à fermo</translation>
+        <translation type="obsolete">Tor à fermo</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>Avvia</translation>
+        <translation type="obsolete">Avvia</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>Ferma</translation>
+        <translation type="obsolete">Ferma</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Informazioni su</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>Grafico dell&apos;ampiezza di banda</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Log dei messaggi</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Strl+S</translation>
+        <translation type="obsolete">Strl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Aiuto di Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Errore nell&apos;avvio di Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Errore nella connessione a Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Errore nell&apos;arresto di Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation type="unfinished">Tor à arrestato</translation>
+        <translation type="obsolete">Tor à arrestato</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor à chiuso</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia non à riuscito a fermare Tor.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation type="unfinished">Avvio di Tor in corso</translation>
+        <translation type="obsolete">Avvio di Tor in corso</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation type="unfinished">Tor à avviato</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>Il server à abilitato</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation type="unfinished">Arresto di Tor in corso</translation>
+        <translation type="obsolete">Arresto di Tor in corso</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Errore nell&apos;applicazione delle impostazioni del server</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia non à riuscito ad utilizzare le impostazioni del server.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -943,7 +943,7 @@
 Si desidera chiudere delicatamente e dare ai client il tempo di trovare un nuovo server?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -952,40 +952,155 @@
 Controlla il log dei messaggi per indicazioni su cos&apos;Ã accaduto a Tor prima che terminasse.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 non à riuscito ad avviare Tor. Controlla le impostazioni per assicurarti di aver specificato nome e posizione corretti per l&apos;eseguibile di Tor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Mappa della Rete</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Nuova identitÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>Tutte le nuove connessioni verranno visualizzate in modo diverso dalle vecchie.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>Impossibile creare una nuova identitÃ</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_nb.ts
===================================================================
--- trunk/src/lang/vidalia_nb.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_nb.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -787,155 +787,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation type="unfinished">Tor er Stoppet</translation>
+        <translation type="obsolete">Tor er Stoppet</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>Start</translation>
+        <translation type="obsolete">Start</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>Stopp</translation>
+        <translation type="obsolete">Stopp</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Om</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Avslutt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>BÃndbredde Graf</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Meldingslogg</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Hjelp</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>Fil</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor </translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>Vis</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Vidalia Hjelp</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Feil ved oppstart av Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Feil ved tilknytning til Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Feil ved Stopping av Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation type="unfinished">Tor er stoppet</translation>
+        <translation type="obsolete">Tor er stoppet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor Avsluttet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia klarte ikke à avslutte Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation type="unfinished">Tor starter</translation>
+        <translation type="obsolete">Tor starter</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation type="unfinished">Tor kjÃrer</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>Tjener er Skrudd pÃ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation type="unfinished">Tor stopper</translation>
+        <translation type="obsolete">Tor stopper</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Feil ved pÃlegging av Tjener-Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia kunne ikke iverksette dine tjener-innstillinger.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -944,7 +944,7 @@
 Vil du stenge ned gradvis og gi dine klienter tid til à finne en ny tjener?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,40 +953,155 @@
 Vennligst sjekk meldings-loggen for indikatorer pà hva som skjedde med Tor fÃr programmet avsluttet.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 kunne ikke starte Tor. Sjekk innstillingene dine for à sikre at du har oppgitt Tor-programmets riktige navn og plassering.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Nettverkskart</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>Innstillinger</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Ny Identitet </translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>Alle dine forbindelser vil se annerledes ut enn dine nÃvÃrende forbindelser.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>Kunne ikke lage Ny Identitet</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_nl.ts
===================================================================
--- trunk/src/lang/vidalia_nl.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_nl.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -787,155 +787,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation type="unfinished">Tor is Gestopt</translation>
+        <translation type="obsolete">Tor is Gestopt</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>Start</translation>
+        <translation type="obsolete">Start</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>Stop</translation>
+        <translation type="obsolete">Stop</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreedte Grafiek</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Berichten Logboek</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>Bekijk</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Vidalia Help</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Fout bij Starten Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Fout bij Verbinden met Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Fout bij Stoppen Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>Tor is gestopt</translation>
+        <translation type="obsolete">Tor is gestopt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor is Afgesloten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia was niet in staat Tor te stoppen.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>Tor is aan het starten</translation>
+        <translation type="obsolete">Tor is aan het starten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>Tor is actief</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>Server is Ingeschakeld</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>Tor is aan het stoppen</translation>
+        <translation type="obsolete">Tor is aan het stoppen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Fout bij Toepassen Server Instellingen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia was niet in staat de server instellingen toe te passen.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -944,7 +944,7 @@
 Wilt u op stijlvolle wijze afsluiten en clients de tijd gunnen om een nieuwe server te vinden?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,40 +953,155 @@
 Bekijk alstublieft het berichten logboek voor meer informatie en mogelijke aanwijzingen met betrekking tot de oorzaak.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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 was niet in staat om Tor te starten. Raadpleeg uw instellingen om te zien of de naam en locatie van uw Tor executable juist is ingesteld.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Netwerk Kaart</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Nieuwe Identiteit</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>Alle eerstvolgende verbindingen zullen anders lijken dan uw oude verbindingen.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>Creren van Nieuwe Identiteit Mislukt</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_pl.ts
===================================================================
--- trunk/src/lang/vidalia_pl.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_pl.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -1,2045 +1,2160 @@
-<?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>
-</context>
-<context>
-    <name>AboutDialog</name>
-    <message>
-        <location filename="../gui/about/aboutdialog.ui" line="290"/>
-        <source>About Vidalia</source>
-        <translation>O Vidali</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>Wersja Qt</translation>
-    </message>
-    <message>
-        <location filename="../gui/about/aboutdialog.ui" line="528"/>
-        <source>Tor Version</source>
-        <translation>Wersja Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/about/aboutdialog.ui" line="359"/>
-        <source>Vidalia Version</source>
-        <translation>Wersja Vidali</translation>
-    </message>
-    <message>
-        <location filename="../gui/about/aboutdialog.cpp" line="79"/>
-        <source>&lt;Not Running&gt;</source>
-        <translation>&lt;Nie uruchomiono&gt;</translation>
-    </message>
-    <message>
-        <location filename="../gui/about/aboutdialog.cpp" line="75"/>
-        <source>&lt;Unavailable&gt;</source>
-        <translation>&lt;NiedostÄpny&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>AdvancedPage</name>
-    <message>
-        <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="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>Uruchom Tor&apos;a uÅywajÄc pliku konfiguracyjnego (torrc)</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.ui" line="644"/>
-        <source>Select path to Tor configuration file</source>
-        <translation>Wybierz ÅcieÅkÄ pliku konfiguracyjnego Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.ui" line="647"/>
-        <source>Browse</source>
-        <translation>PrzeglÄdaj</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.ui" line="666"/>
-        <source>Permissions</source>
-        <translation>Uprawnienia</translation>
-    </message>
-    <message>
-        <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="702"/>
-        <source>Vidalia will run with this User&apos;s permissions</source>
-        <translation>Vidalia wykorzysta uprawnienia tego UÅytkownika</translation>
-    </message>
-    <message>
-        <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="729"/>
-        <source>Vidalia will run with this Group&apos;s permissions</source>
-        <translation>Vidalia wykorzysta uprawnienia Grupy</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.cpp" line="119"/>
-        <source>Select Tor Configuration File</source>
-        <translation>Wybierz plik konfiguracyjny Tor&apos;a</translation>
-    </message>
-    <message>
-        <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="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="145"/>
-        <source>Failed to Create File</source>
-        <translation>Nie udaÅo siÄ utworzyÄ pliku</translation>
-    </message>
-    <message>
-        <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="753"/>
-        <source>Service</source>
-        <translation>UsÅuga</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>Zaznacz, jeÅli chcesz uruchamiaÄ Tor&apos;a jako usÅugÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.ui" line="771"/>
-        <source>Run Tor in the background as a Windows service</source>
-        <translation>Uruchamiaj Tor&apos;a jako usÅugÄ Windows</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.cpp" line="169"/>
-        <source>Unable to remove Tor Service</source>
-        <translation>UsuniÄcie usÅugi Tor&apos;a nie powiodÅo siÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.cpp" line="180"/>
-        <source>Unable to install Tor Service</source>
-        <translation>Instalacja usÅugi Tor&apos;a nie powiodÅa siÄ</translation>
-    </message>
-    <message>
-        <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="171"/>
-        <source>Vidalia was unable to remove the Tor service.
-
-You may need to remove it manually.</source>
-        <translation>Vidalia nie mogÅa usunÄÄ usÅugi Tor&apos;a.
-
-Musisz usunÄÄ jÄ rÄcznie.</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.ui" line="604"/>
-        <source>Tor Configuration File</source>
-        <translation>Plik konfiguracyjny Tor&apos;a</translation>
-    </message>
-    <message>
-        <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&apos;em</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.cpp" line="80"/>
-        <source>&apos;%1&apos; is not a valid IP address.</source>
-        <translation>&apos;%1&apos; nie jest poprawnym adresem IP.</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.ui" line="542"/>
-        <source>IP address on which Tor is listening for controller connections.</source>
-        <translation>Adres IP na ktÃrym nasÅuchuje Tor.</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/advancedpage.ui" line="549"/>
-        <source>:</source>
-        <translation>:</translation>
-    </message>
-</context>
-<context>
-    <name>AppearancePage</name>
-    <message>
-        <location filename="../gui/config/appearancepage.ui" line="301"/>
-        <source>Language</source>
-        <translation>JÄzyk</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/appearancepage.ui" line="322"/>
-        <source>Choose the language used in Vidalia</source>
-        <translation>Wybierz jÄzyk aplikacji</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/appearancepage.ui" line="354"/>
-        <source>Changes to language will only take effect after restarting Vidalia!</source>
-        <translation>Zmiana jÄzyka przyniesie efekt dopiero po restarcie programu!</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/appearancepage.ui" line="370"/>
-        <source>Style</source>
-        <translation>Styl</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/appearancepage.ui" line="404"/>
-        <source>Choose Vidalia&apos;s interface style</source>
-        <translation>Wybierz styl interfejsu</translation>
-    </message>
-</context>
-<context>
-    <name>BandwidthGraph</name>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="490"/>
-        <source>Tor Bandwidth Usage</source>
-        <translation>UÅycie ÅÄcza</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="514"/>
-        <source>Show Settings</source>
-        <translation>PokaÅ ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="537"/>
-        <source>Reset</source>
-        <translation>Resetuj</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="630"/>
-        <source>Receive Rate</source>
-        <translation>PokaÅ ÅciÄganie</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="654"/>
-        <source>Send Rate</source>
-        <translation>PokaÅ wysyÅanie</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="773"/>
-        <source>Changes the transparency of the Bandwidth Graph</source>
-        <translation>Zmienia przezroczystoÅÄ okna</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="932"/>
-        <source>Save</source>
-        <translation>Zapisz</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="939"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.cpp" line="170"/>
-        <source>Since:</source>
-        <translation>Wykres od:</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>% Nieprzejrzyste</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.cpp" line="236"/>
-        <source>Hide Settings</source>
-        <translation>Ukryj ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="667"/>
-        <source>Always on Top</source>
-        <translation>Na wierzchu</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/bwgraph.ui" line="723"/>
-        <source>Style</source>
-        <translation>Styl</translation>
-    </message>
-</context>
-<context>
-    <name>Circuit</name>
-    <message>
-        <location filename="../control/circuit.cpp" line="109"/>
-        <source>New</source>
-        <translation>Nowe</translation>
-    </message>
-    <message>
-        <location filename="../control/circuit.cpp" line="110"/>
-        <source>Open</source>
-        <translation>Aktywne</translation>
-    </message>
-    <message>
-        <location filename="../control/circuit.cpp" line="111"/>
-        <source>Building</source>
-        <translation>ÅÄczenie</translation>
-    </message>
-    <message>
-        <location filename="../control/circuit.cpp" line="112"/>
-        <source>Failed</source>
-        <translation>Nie powiodÅo siÄ</translation>
-    </message>
-    <message>
-        <location filename="../control/circuit.cpp" line="113"/>
-        <source>Closed</source>
-        <translation>ZakoÅczone</translation>
-    </message>
-    <message>
-        <location filename="../control/circuit.cpp" line="114"/>
-        <source>Unknown</source>
-        <translation>Nieznane</translation>
-    </message>
-</context>
-<context>
-    <name>CircuitItem</name>
-    <message>
-        <location filename="../gui/network/circuititem.cpp" line="48"/>
-        <source>&lt;Path Empty&gt;</source>
-        <translation>&lt;ÅcieÅka pusta&gt;</translation>
-    </message>
-</context>
-<context>
-    <name>CircuitListWidget</name>
-    <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
-        <source>Connection</source>
-        <translation>PoÅÄczenie</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
-        <source>Status</source>
-        <translation>Status</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="56"/>
-        <source>Close Circuit</source>
-        <translation>Zamknij poÅÄczenie</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="62"/>
-        <source>Close Stream</source>
-        <translation>Zamknij strumieÅ</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="55"/>
-        <source>Zoom to Circuit</source>
-        <translation>ZbliÅ poÅÄczenie</translation>
-    </message>
-</context>
-<context>
-    <name>ConfigDialog</name>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="56"/>
-        <source>General</source>
-        <translation>OgÃlne</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="59"/>
-        <source>Server</source>
-        <translation>Serwer</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="65"/>
-        <source>Advanced</source>
-        <translation>Zaawansowane</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="83"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="62"/>
-        <source>Appearance</source>
-        <translation>WyglÄd</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="78"/>
-        <source>Save</source>
-        <translation>Zapisz</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="154"/>
-        <source>Error Saving Configuration</source>
-        <translation>BÅad zapisywania konfiguracji</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.cpp" line="74"/>
-        <source>Help</source>
-        <translation>Pomoc</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/configdialog.ui" line="289"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-</context>
-<context>
-    <name>ControlConnection</name>
-    <message>
-        <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="239"/>
-        <source>Control socket is not connected</source>
-        <translation>Gniazdo sterujÄce nie jest podÅÄczone</translation>
-    </message>
-</context>
-<context>
-    <name>ControlSocket</name>
-    <message>
-        <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="101"/>
-        <source>Error disconnecting socket. [%1]</source>
-        <translation>BÅÄd przy rozÅÄczaniu gniazda. [%1]</translation>
-    </message>
-    <message>
-        <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="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="234"/>
-        <source>Invalid control reply. [%1]</source>
-        <translation>NieprawidÅowy kod odpowiedzi. [%1]</translation>
-    </message>
-    <message>
-        <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="81"/>
-        <source>Vidalia was unable to determine Tor&apos;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&apos;a. SprawdÅ, czy numer portu jest ustawiony poprawnie i Åe posiadasz uruchomionÄ najnowszÄ wersjÄ Tor&apos;a.</translation>
-    </message>
-    <message>
-        <location filename="../control/controlsocket.cpp" line="85"/>
-        <source>Vidalia only supports Version 1 of Tor&apos;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>
-    </message>
-</context>
-<context>
-    <name>GeneralPage</name>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="334"/>
-        <source>Path to Tor&apos;s executable</source>
-        <translation>ÅcieÅka do pliku wykonywalnego Tor</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="353"/>
-        <source>Select path to Tor executable</source>
-        <translation>Wybierz ÅcieÅkÄ do pliku wykonywalnego Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="356"/>
-        <source>Browse</source>
-        <translation>PrzeglÄdaj</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="375"/>
-        <source>Startup Options</source>
-        <translation>Opcje startowe</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="390"/>
-        <source>Select to start Vidalia on system boot</source>
-        <translation>Zaznacz, aby Vidalia uruchamiaÅa siÄ zawsze automatycznie.</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="393"/>
-        <source>Run Vidalia on system startup</source>
-        <translation>Uruchom VidaliÄ przy starcie systemu</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="406"/>
-        <source>Set to start Tor when you launch Vidalia</source>
-        <translation>Zaznacz, aby Vidalia sama uruchamiaÅa Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="409"/>
-        <source>Start Tor when Vidalia starts</source>
-        <translation>WÅÄczaj Tor&apos;a gdy Vidalia startuje</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.cpp" line="72"/>
-        <source>Select Path to Tor</source>
-        <translation>Wybierz ÅcieÅkÄ do Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.ui" line="307"/>
-        <source>Tor Executable</source>
-        <translation>Plik wykonywalny Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/generalpage.cpp" line="63"/>
-        <source>Executables (*.exe)</source>
-        <translation>Pliki wykonywalne (.exe)</translation>
-    </message>
-</context>
-<context>
-    <name>GraphFrame</name>
-    <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="248"/>
-        <source>Recv: </source>
-        <translation>Odbr:</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="257"/>
-        <source>Sent: </source>
-        <translation>WysÅ:</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="269"/>
-        <source>%1 KB</source>
-        <translation>%1 KB</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="272"/>
-        <source>%1 MB</source>
-        <translation>%1 MB</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="275"/>
-        <source>%1 GB</source>
-        <translation>%1 GB</translation>
-    </message>
-    <message>
-        <location filename="../gui/bwgraph/graphframe.cpp" line="296"/>
-        <source>%1 KB/s</source>
-        <translation>%1 KB/s</translation>
-    </message>
-</context>
-<context>
-    <name>HelpBrowser</name>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="303"/>
-        <source>Vidalia Help</source>
-        <translation>Pomoc Vidalii</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="449"/>
-        <source>Find Previous</source>
-        <translation>ZnajdÅ poprzednie</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="462"/>
-        <source>Find Next</source>
-        <translation>ZnajdÅ nastÄpne</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="496"/>
-        <source>Case sensitive</source>
-        <translation>WaÅna wielkoÅÄ liter</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="535"/>
-        <source>Contents</source>
-        <translation>ZawartoÅÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="580"/>
-        <source>Help Topics</source>
-        <translation>Tematy pomocy</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="625"/>
-        <source>Search</source>
-        <translation>Szukaj</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="680"/>
-        <source>Found Documents</source>
-        <translation>Znalezione dokumenty</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="759"/>
-        <source>Back</source>
-        <translation>Cofnij</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="762"/>
-        <source>Move to previous page (Backspace)</source>
-        <translation>PrzejdÅ do poprzedniej strony (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>W przÃd</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="781"/>
-        <source>Move to next page (Shift+Backspace)</source>
-        <translation>PrzejdÅ do nastÄpnej strony (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>GÅÃwna</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="800"/>
-        <source>Move to the Home page (Ctrl+H)</source>
-        <translation>PrzejdÅ do strony gÅÃwnej</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>ZnajdÅ</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>Szuka sÅowa lub sÅÃw na bieÅÄcej stronie (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>Zamknij</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="847"/>
-        <source>Close Vidalia Help</source>
-        <translation>Zamknij pomoc Vidalii</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>BÅÄd wczytywania zawartoÅci pomocy: </translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="372"/>
-        <source>Search reached end of document</source>
-        <translation>Wyszukiwanie dotarÅo do koÅca dokumentu</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="374"/>
-        <source>Search reached start of document</source>
-        <translation>Wyszukiwanie dotarÅo do poczÄtku dokumentu</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="376"/>
-        <source>Text not found in document</source>
-        <translation>Nie znaleziono tekstu w dokumencie</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="427"/>
-        <source>Find:</source>
-        <translation>ZnajdÅ:</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="506"/>
-        <source>Whole words only</source>
-        <translation>Tylko caÅe sÅowa</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.ui" line="637"/>
-        <source>Searching for:</source>
-        <translation>Szukanie:</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="133"/>
-        <source>Supplied XML file is not a valid Contents document.</source>
-        <translation>Plik XML nie jest prawidÅowym plikiem dokumentu ZawartoÅci.</translation>
-    </message>
-    <message>
-        <location filename="../gui/help/browser/helpbrowser.cpp" line="421"/>
-        <source>Found %1 results</source>
-        <translation>Znaleziono %1 wynik(i/Ãw)</translation>
-    </message>
-</context>
-<context>
-    <name>HelpTextBrowser</name>
-    <message>
-        <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
-        <source>Error opening help file: </source>
-        <translation>BÅÄd otwierania pliku pomocy: </translation>
-    </message>
-</context>
-<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>Informacja</translation>
-    </message>
-    <message>
-        <location filename="../control/logevent.cpp" line="70"/>
-        <source>Notice</source>
-        <translation>Powiadomienie</translation>
-    </message>
-    <message>
-        <location filename="../control/logevent.cpp" line="71"/>
-        <source>Warning</source>
-        <translation>OstrzeÅenie</translation>
-    </message>
-    <message>
-        <location filename="../control/logevent.cpp" line="72"/>
-        <source>Error</source>
-        <translation>BÅÄd</translation>
-    </message>
-    <message>
-        <location filename="../control/logevent.cpp" line="73"/>
-        <source>Unknown</source>
-        <translation>Nieznany</translation>
-    </message>
-</context>
-<context>
-    <name>LogTreeWidget</name>
-    <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="40"/>
-        <source>Messages Shown: </source>
-        <translation>WiadomoÅci:</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
-        <source>Messages Shown: %1</source>
-        <translation>WiadomoÅci: %1</translation>
-    </message>
-</context>
-<context>
-    <name>MainWindow</name>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="239"/>
-        <source>Tor is Stopped</source>
-        <translation>Tor jest zatrzymany</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="194"/>
-        <source>Start</source>
-        <translation>Uruchom</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="198"/>
-        <source>Stop</source>
-        <translation>Zatrzymaj</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
-        <source>About</source>
-        <translation>Informacje</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
-        <source>Exit</source>
-        <translation>WyjdÅ</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
-        <source>Bandwidth Graph</source>
-        <translation>ZuÅycie ÅÄcza</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
-        <source>Message Log</source>
-        <translation>Dziennik LogÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
-        <source>Help</source>
-        <translation>Pomoc</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>Plik</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>Widok</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
-        <source>Vidalia Help</source>
-        <translation>Pomoc Vidalii</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
-        <source>Error Starting Tor</source>
-        <translation>BÅÄd uruchamiania Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
-        <source>Error Connecting to Tor</source>
-        <translation>BÅÄd podÅÄczenia do Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
-        <source>Error Stopping Tor</source>
-        <translation>BÅad zatrzymywania Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="491"/>
-        <source>Tor is stopped</source>
-        <translation>Tor jest zatrzymany</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
-        <source>Tor Exited</source>
-        <translation>Tor wyÅÄczony</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
-        <source>Vidalia was unable to stop Tor.</source>
-        <translation>Vidalia nie mogÅa zatrzymaÄ Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="394"/>
-        <source>Tor is starting</source>
-        <translation>Uruchamianie Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
-        <source>Tor is running</source>
-        <translation>Tor aktywny</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
-        <source>Server is Enabled</source>
-        <translation>Serwer uaktywniony</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="467"/>
-        <source>Tor is stopping</source>
-        <translation>Zatrzymywanie Tor&apos;a</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>Aktualizacja ustawieÅ serwera nie powiodÅa siÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
-        <source>Vidalia was unable to apply your server&apos;s settings.</source>
-        <translation>Vidalia nie byÅa w stanie zaktualizowaÄ ustawieÅ Twojego serwera</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>
-        <translation>Posiadasz uruchomiony serwer Tor&apos;a. WyÅÄczenie go spowoduje przerwanie wszelkich poÅÄczeÅ z klientami.
-
-Czy chciaÅbyÅ dokonaÄ tego elegancko, dajÄc klientom czas na znalezienie nowego serwera?</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>
-        <translation>Wykryto niespodziewane zamkniÄcie Tor&apos;a.
-
-ProszÄ sprawdziÄ Dziennik LogÃw, aby zidentyfikowaÄ przyczynÄ.</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 nie mogÅa uruchomiÄ Tor&apos;a. ProszÄ sprawdziÄ ustawienia, aby upewniÄ siÄ co do ÅcieÅki dostÄpu do pliku wykonywalnego Tor&apos;a.</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
-        <source>Network Map</source>
-        <translation>Mapa Sieci</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
-        <source>New Identity</source>
-        <translation>Nowa ToÅsamoÅÄ</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>Wszystkie nastÄpne poÅÄczenia bÄdÄ inne niÅ Twoje obecne.</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
-        <source>Failed to Create New Identity</source>
-        <translation>Tworzenie nowej toÅsamoÅci nie powiodÅo siÄ.</translation>
-    </message>
-</context>
-<context>
-    <name>MessageLog</name>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="289"/>
-        <source>Message Log</source>
-        <translation>Dziennik LogÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="336"/>
-        <source>Time</source>
-        <translation>Czas</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="341"/>
-        <source>Type</source>
-        <translation>Typ</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="346"/>
-        <source>Message</source>
-        <translation>WiadomoÅÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="646"/>
-        <source>Browse</source>
-        <translation>PrzeglÄdaj</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="430"/>
-        <source>Saves the current Message Log settings</source>
-        <translation>Zapisuje bieÅÄce ustawienia Dziennika LogÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="433"/>
-        <source>Save Settings</source>
-        <translation>Zapisz ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="449"/>
-        <source>Cancels changes made to settings</source>
-        <translation>Anuluje zmiany dokonane w ustawieniach</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="452"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="466"/>
-        <source>Message Filter</source>
-        <translation>Filtr wiadomoÅci</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="487"/>
-        <source>Error</source>
-        <translation>BÅÄd</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="503"/>
-        <source>Warning</source>
-        <translation>OstrzeÅenie</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="519"/>
-        <source>Notice</source>
-        <translation>Powiadomienie</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="535"/>
-        <source>Info</source>
-        <translation>Informacja</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="551"/>
-        <source>Debug</source>
-        <translation>Systemowe</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="727"/>
-        <source>Message Filters...</source>
-        <translation>Filtry wiadomoÅci...</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="730"/>
-        <source>Set message filters</source>
-        <translation>Ustawia filtrowanie wiadomoÅci</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="743"/>
-        <source>History Size...</source>
-        <translation>Rozmiar historii...</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="746"/>
-        <source>Set maximum number of messages to display</source>
-        <translation>Ustawia maksymalnÄ liczbÄ wyÅwietlanych wiadomoÅci</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="762"/>
-        <source>Clear</source>
-        <translation>WyczyÅÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="765"/>
-        <source>Clear all messages from the Message Log (Ctrl+E)</source>
-        <translation>CzyÅci wszystkie wiadomoÅci z Dziennika LogÃw (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>Kopiuj</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="790"/>
-        <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
-        <translation>Kopiuje zaznaczone wiadomoÅci do schowka (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>Zaznacz wszystkie</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="812"/>
-        <source>Select all messages (Ctrl+A)</source>
-        <translation>Zaznacza wszystkie wiadomoÅci (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>Zapisz wszystkie</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="831"/>
-        <source>Save all messages to a file</source>
-        <translation>Zapisuje wszystkie wiadomoÅci do pliku</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="844"/>
-        <source>Save Selected</source>
-        <translation>Zapisz wybrane</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="847"/>
-        <source>Save selected messages to a file</source>
-        <translation>Zapisuje zaznaczone wiadomoÅci do pliku</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="901"/>
-        <source>Close</source>
-        <translation>Zamknij</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="904"/>
-        <source>Close the Message Log</source>
-        <translation>Zamyka Dziennik LogÃw</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>ZnajdÅ</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="926"/>
-        <source>Find all messages containing the search text (Ctrl+F)</source>
-        <translation>Znajduje wszystkie wiadomoÅci zawierajÄce szukany tekst (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>WiadomoÅci informujÄce o wystÄpieniu
-powaÅnych bÅedÃw, uniemoÅliwiajÄcych dalszÄ pracÄ.</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>WiadomoÅci informujÄce
-o bÅÄdach Tor&apos;a</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 
-care about.</source>
-        <translation>WiadomoÅci informujÄce o zdarzeniach
-nie bÄdÄcych bÅÄdami, lecz mogÄ one byÄ istotne.</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="156"/>
-        <source>Messages that appear frequently 
-during normal Tor operation.</source>
-        <translation>WiadomoÅci dotyczÄce prawidÅowej
-pracy Tor&apos;a.</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="158"/>
-        <source>Hyper-verbose messages primarily of 
-interest to Tor developers.</source>
-        <translation>Bardzo szczegÃÅowe informacje,
-dla programistÃw ekipy Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="203"/>
-        <source>Error Setting Filter</source>
-        <translation>BÅÄd ustawiania filtru</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="219"/>
-        <source>Error Opening Log File</source>
-        <translation>BÅÄd otwierania pliku logÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="294"/>
-        <source>Select Log File</source>
-        <translation>Wybierz plik z Logami</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="311"/>
-        <source>Save Log Messages</source>
-        <translation>Zapisz Logi</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>Wyszukaj wiadomoÅÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="377"/>
-        <source>Find:</source>
-        <translation>ZnajdÅ:</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="383"/>
-        <source>Not Found</source>
-        <translation>Nie znaleziono</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="384"/>
-        <source>Search found 0 matches.</source>
-        <translation>Znaleziono 0 pasujÄcych.</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="863"/>
-        <source>Settings</source>
-        <translation>Ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="866"/>
-        <source>Adjust Message Log Settings</source>
-        <translation>Zmienia ustawienia LogÃw</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>Pomoc</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="885"/>
-        <source>Show the help browser</source>
-        <translation>Pokazuje przeglÄdarkÄ Pomocy</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="204"/>
-        <source>Vidalia was unable to register for Tor&apos;s log events.</source>
-        <translation>Vidalia nie mogÅa zarejestrowaÄ siÄ jako odbiorca logÃw Tor&apos;a</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="324"/>
-        <source>Cannot write file %1
-
-%2.</source>
-        <translation>BÅÄd zapisu pliku %1
-
-%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 nie mogÅa otworzyÄ wskazanego pliku LogÃw.</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.cpp" line="314"/>
-        <source>Text Files (*.txt)</source>
-        <translation>Pliki tekstowe (*.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>Wymagana nazwa pliku loga</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>Musisz wpisaÄ nazwÄ pliku, aby mÃc zapisywaÄ wiadomoÅci do pliku.</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="567"/>
-        <source>Message Log History</source>
-        <translation>Historia LogÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="588"/>
-        <source>Number of messages to display in the message log window</source>
-        <translation>Liczba wiadomoÅci wyÅwietlanych w oknie logÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="612"/>
-        <source>messages</source>
-        <translation>wiadomoÅci</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="631"/>
-        <source>Always Save New Log Messages</source>
-        <translation>Zawsze zapisuj nowe wiadomoÅci</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="669"/>
-        <source>Enable automatically saving all new log messages to a file</source>
-        <translation>WÅÄcz automatyczne zapisywanie wszystkich nowych wiadomoÅci d pliku</translation>
-    </message>
-    <message>
-        <location filename="../gui/log/messagelog.ui" line="672"/>
-        <source>Automatically save new log messages to a file</source>
-        <translation>Automatycznie zapisuj wiadomoÅci do pliku</translation>
-    </message>
-</context>
-<context>
-    <name>NetViewer</name>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="297"/>
-        <source>View Tor Network</source>
-        <translation>Widok Sieci Tor</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="518"/>
-        <source>Refresh</source>
-        <translation>OdÅwieÅ</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="540"/>
-        <source>Help</source>
-        <translation>Pomoc</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="562"/>
-        <source>Close</source>
-        <translation>Zamknij</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="584"/>
-        <source>Zoom In</source>
-        <translation>ZbliÅenie</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="606"/>
-        <source>Zoom Out</source>
-        <translation>Oddalenie</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="524"/>
-        <source>Refresh the list of routers and connections</source>
-        <translation>OdÅwieÅa listÄ ruterÃw i poÅaczeÅ</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="543"/>
-        <source>Show network map help</source>
-        <translation>Pokazuje pomoc dla Widoku Sieci</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="546"/>
-        <source>Show the network map help</source>
-        <translation>Pokazuje pomoc dla Widoku Sieci</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="568"/>
-        <source>Close the network map</source>
-        <translation>Zamyka Widok Sieci</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="590"/>
-        <source>Zoom in on the network map</source>
-        <translation>PowiÄksza widok na mapie</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="612"/>
-        <source>Zoom out on the network map</source>
-        <translation>Pomniejsza widok na mapie</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="628"/>
-        <source>Zoom To Fit</source>
-        <translation>PokaÅ caÅoÅÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="634"/>
-        <source>Zooms to fit all currently displayed circuits</source>
-        <translation>Ustaw powiÄkszenie tak, aby objÄÄ wszystkie poÅÄczenia</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>
-</context>
-<context>
-    <name>Policy</name>
-    <message>
-        <location filename="../config/policy.cpp" line="178"/>
-        <source>accept</source>
-        <translation>akceptuj</translation>
-    </message>
-    <message>
-        <location filename="../config/policy.cpp" line="178"/>
-        <source>reject</source>
-        <translation>odrzuÄ</translation>
-    </message>
-</context>
-<context>
-    <name>RouterDescriptor</name>
-    <message>
-        <location filename="../control/routerdescriptor.cpp" line="87"/>
-        <source>Online</source>
-        <translation>DziaÅa</translation>
-    </message>
-    <message>
-        <location filename="../control/routerdescriptor.cpp" line="89"/>
-        <source>Hibernating</source>
-        <translation>UÅpiony</translation>
-    </message>
-    <message>
-        <location filename="../control/routerdescriptor.cpp" line="91"/>
-        <source>Offline</source>
-        <translation>WyÅÄczony</translation>
-    </message>
-</context>
-<context>
-    <name>RouterDescriptorView</name>
-    <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
-        <source>IP Address:</source>
-        <translation>Adres IP:</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
-        <source>Platform:</source>
-        <translation>Platforma:</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
-        <source>Bandwidth:</source>
-        <translation>PrzepustowoÅÄ:</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
-        <source>Uptime:</source>
-        <translation>DziaÅa:</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
-        <source>Last Updated:</source>
-        <translation>Aktualizacja:</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
-        <source>Location:</source>
-        <translation>Lokalizacja:</translation>
-    </message>
-</context>
-<context>
-    <name>RouterListItem</name>
-    <message>
-        <location filename="../gui/network/routerlistitem.cpp" line="94"/>
-        <source>%1 KB/s</source>
-        <translation>%1 KB/s</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerlistitem.cpp" line="78"/>
-        <source>Offline</source>
-        <translation>WyÅÄczony</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerlistitem.cpp" line="82"/>
-        <source>Hibernating</source>
-        <translation>UÅpiony</translation>
-    </message>
-</context>
-<context>
-    <name>RouterListWidget</name>
-    <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
-        <source>Server</source>
-        <translation>Serwer</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
-        <source>Zoom to Server</source>
-        <translation>PrzybliÅ serwer</translation>
-    </message>
-    <message>
-        <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
-        <source>%1 servers online (%2 total)</source>
-        <translation>%1 serwerÃw aktywnych (%2 wszystkich)</translation>
-    </message>
-</context>
-<context>
-    <name>ServerPage</name>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="502"/>
-        <source>Check to run as a Tor network server</source>
-        <translation>Zaznacz, aby uruchomiÄ serwer sieci Tor</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="505"/>
-        <source>Relay traffic for the Tor network</source>
-        <translation>UdostÄpnij moje ÅÄcze dla sieci Tor</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="716"/>
-        <source>Directory Port:</source>
-        <translation>Port Listy:</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="746"/>
-        <source>Directory Port Number</source>
-        <translation>Numer portu Listy SerwerÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="616"/>
-        <source>Nickname:</source>
-        <translation>Ksywa:</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="821"/>
-        <source>Name of your server</source>
-        <translation>Nazwa Twojego serwera</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="684"/>
-        <source>Contact Info:</source>
-        <translation>Kontakt:</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="638"/>
-        <source>Server Port:</source>
-        <translation>Port serwera:</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>Port na ktÃrym uÅytkownicy i inne serwery komunikujÄ siÄ z Twoim</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="565"/>
-        <source>Address:</source>
-        <translation>Adres:</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="781"/>
-        <source>Domain name or IP address of your server</source>
-        <translation>Nazwa domeny albo adres IP Twojego serwera</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="837"/>
-        <source>Enable to mirror the server directory</source>
-        <translation>WÅÄcza zapamiÄtywanie listy serwerÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="840"/>
-        <source>Mirror the Server Directory </source>
-        <translation>Przechowuj ListÄ SerwerÃw </translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="590"/>
-        <source>Attempts to determine the correct address for your server</source>
-        <translation>PrÃbuje ustaliÄ adres Twojego serwera</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="593"/>
-        <source>Get Address</source>
-        <translation>Pobierz adres</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1251"/>
-        <source>Exit Policies</source>
-        <translation>Polityka poÅÄczeÅ</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1377"/>
-        <source>Show help topic on exit policies</source>
-        <translation>Pokazuje pomoc dotyczÄcÄ reguÅ</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.cpp" line="148"/>
-        <source>You must specify at least a server nickname and port.</source>
-        <translation>Musisz podaÄ nazwÄ serwera oraz port.</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.cpp" line="232"/>
-        <source>Error</source>
-        <translation>BÅÄd</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.cpp" line="233"/>
-        <source>Vidalia was unable to determine your public IP address.</source>
-        <translation>Vidalia nie mogÅa ustaliÄ Twojego publicznego adresu 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>
-        <translation>Vidalia ustaliÅa tylko wewnÄtrzny adres IP twojego servera.
-
-Czy chciaÅbyÅ skorzystaÄ z zewnÄtrznego ÅrÃdÅa aby ustaliÄ adres TwÃj publiczny ?</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>Gdy zaznaczone, Vidalia bÄdzie sprawdzaÄ TwÃj aktualny adres IP, jeÅli zajdzie potrzeba</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="853"/>
-        <source>Automatically Update</source>
-        <translation>Aktualizuj automatycznie</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>
-        <translation>Adres e-mail pod ktÃrym jesteÅ dostÄpny, gdy wystÄpi problem z Twoim serwerem. MoÅesz rÃwnieÅ zaÅÄczyÄ swoje klucze publiczne PGP lub GPG.</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1107"/>
-        <source>Long-term average bandwidth limit</source>
-        <translation>DÅugookresowa Årednia przepustowoÅÄ Twojego ÅÄcza</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1078"/>
-        <source>Average Rate</source>
-        <translation>Årednia przepustowoÅÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1195"/>
-        <source>KB/s</source>
-        <translation>KB/s</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1182"/>
-        <source>Peak bandwidth rate limit</source>
-        <translation>Szczytowa przepustowoÅÄ Twojego ÅÄcza</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1153"/>
-        <source>Maximum Rate</source>
-        <translation>Maksymalna przepustowoÅÄ</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="989"/>
-        <source>Show help topic on bandwidth rate limits</source>
-        <translation>Pokazuje pomoc na temat limitÃw przepustowoÅci</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="537"/>
-        <source>Basic Settings</source>
-        <translation>Ustawienia podstawowe</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="887"/>
-        <source>Bandwidth Limits</source>
-        <translation>Limity przepustowoÅci</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>Dla poÅÄczeÅ o wysokiej prÄdkoÅci ÅciÄgania a niskiej wysyÅania, proszÄ wybraÄ typ o zbliÅonej prÄdkoÅci wysyÅania.</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="943"/>
-        <source>Select the entry that most closely resembles your Internet connection</source>
-        <translation>Wybierz typ najdokÅadniej opisujÄcy Twoje poÅÄczenie Internetowe</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="953"/>
-        <source>Cable/DSL 256 Kbps</source>
-        <translation>Cable/DSL 256 Kbps</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="958"/>
-        <source>Cable/DSL 512 Kbps</source>
-        <translation>Cable/DSL 512 Kbps</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="963"/>
-        <source>Cable/DSL 768 Kbps</source>
-        <translation>Cable/DSL 768 Kbps</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="968"/>
-        <source>T1/Cable/DSL 1.5 Mbps</source>
-        <translation>T1/Cable/DSL 1.5 Mbps</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="973"/>
-        <source>&gt; 1.5 Mbps</source>
-        <translation>&gt; 1.5 Mbps</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="978"/>
-        <source>Custom</source>
-        <translation>Inny</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1289"/>
-        <source>Ports 6660 - 6669 and 6697</source>
-        <translation>Porty 6660 - 6669 i 6697</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1292"/>
-        <source>Internet Relay Chat (IRC)</source>
-        <translation>UsÅuga IRC</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1302"/>
-        <source>Ports 110, 143, 993 and 995</source>
-        <translation>Porty 110, 143, 993 i 995</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1305"/>
-        <source>Retrieve Mail (POP, IMAP)</source>
-        <translation>Odbieranie maili (POP, IMAP)</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1315"/>
-        <source>Ports unspecified by other checkboxes</source>
-        <translation>PozostaÅe niewymienione porty</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1318"/>
-        <source>Misc Other Services</source>
-        <translation>Inne usÅugi</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1328"/>
-        <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
-        <translation>Porty 706, 1863, 5050, 5190, 5222, 8300 i 8888</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1331"/>
-        <source>Instant Messaging (IM)</source>
-        <translation>Komunikatory internetowe</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1341"/>
-        <source>Port 443</source>
-        <translation>Port 443</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1344"/>
-        <source>Secure Websites (SSL)</source>
-        <translation>Bezpieczne witryny (SSL)</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1354"/>
-        <source>Port 80</source>
-        <translation>Port 80</translation>
-    </message>
-    <message>
-        <location filename="../gui/config/serverpage.ui" line="1357"/>
-        <source>Websites</source>
-        <translation>Strony WWW</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>Do jakich zasobÃw Internetu bÄdÄ mieli dostÄp uÅytkownicy Tor&apos;a korzystajÄcy z Twojego serwera?</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>Twoja maksymalna przepustowoÅÄ musi byÄ wiÄksza lub rÃwna Åredniej przepustowoÅci. Obie wartoÅci muszÄ wynosiÄ co najmniej 20 KB/s.</translation>
-    </message>
-</context>
-<context>
-    <name>Stream</name>
-    <message>
-        <location filename="../control/stream.cpp" line="110"/>
-        <source>New</source>
-        <translation>Nowy</translation>
-    </message>
-    <message>
-        <location filename="../control/stream.cpp" line="112"/>
-        <source>Resolving</source>
-        <translation>Analizowanie</translation>
-    </message>
-    <message>
-        <location filename="../control/stream.cpp" line="113"/>
-        <source>Connecting</source>
-        <translation>ÅÄczenie</translation>
-    </message>
-    <message>
-        <location filename="../control/stream.cpp" line="114"/>
-        <source>Open</source>
-        <translation>Otwarty</translation>
-    </message>
-    <message>
-        <location filename="../control/stream.cpp" line="115"/>
-        <source>Failed</source>
-        <translation>BÅÄd</translation>
-    </message>
-    <message>
-        <location filename="../control/stream.cpp" line="116"/>
-        <source>Closed</source>
-        <translation>ZamkniÄty</translation>
-    </message>
-    <message>
-        <location filename="../control/stream.cpp" line="118"/>
-        <source>Unknown</source>
-        <translation>Nieznany</translation>
-    </message>
-    <message>
-        <location filename="../control/stream.cpp" line="117"/>
-        <source>Retrying</source>
-        <translation>PowtÃrna prÃba</translation>
-    </message>
-</context>
-<context>
-    <name>TorProcess</name>
-    <message>
-        <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>
-</context>
-<context>
-    <name>TorService</name>
-    <message>
-        <location filename="../control/torservice.cpp" line="155"/>
-        <source>The Tor service is not installed.</source>
-        <translation>UsÅuga Tor&apos;a nie jest zainstalowana.</translation>
-    </message>
-    <message>
-        <location filename="../control/torservice.cpp" line="173"/>
-        <source>Unable to start the Tor service.</source>
-        <translation>Uruchomienie usÅugi Tor nie powiodÅo siÄ.</translation>
-    </message>
-</context>
-<context>
-    <name>VMessageBox</name>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="88"/>
-        <source>OK</source>
-        <translation>OK</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="89"/>
-        <source>Cancel</source>
-        <translation>Anuluj</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="90"/>
-        <source>Yes</source>
-        <translation>Tak</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="91"/>
-        <source>No</source>
-        <translation>Nie</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="92"/>
-        <source>Help</source>
-        <translation>Pomoc</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="93"/>
-        <source>Retry</source>
-        <translation>PonÃw</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="94"/>
-        <source>Show Log</source>
-        <translation>PokaÅ log</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="95"/>
-        <source>Show Settings</source>
-        <translation>PokaÅ ustawienia</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="96"/>
-        <source>Continue</source>
-        <translation>Kontynuuj</translation>
-    </message>
-    <message>
-        <location filename="../gui/common/vmessagebox.cpp" line="97"/>
-        <source>Quit</source>
-        <translation>WyjdÅ</translation>
-    </message>
-</context>
-<context>
-    <name>Vidalia</name>
-    <message>
-        <location filename="../vidalia.cpp" line="230"/>
-        <source>Invalid language code specified: </source>
-        <translation>OkreÅlono nieprawidÅowy kod jÄzyka: </translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="237"/>
-        <source>Invalid GUI style specified: </source>
-        <translation>Wybrano niewÅaÅciwy styl GUI: </translation>
-    </message>
-    <message>
-        <location filename="../main.cpp" line="86"/>
-        <source>Vidalia is already running</source>
-        <translation>Vidalia jest juÅ uruchomiona</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>
-        <translation>Inny proces Vidalii jest prawdopodobnie juÅ uruchomiony. JeÅli jesteÅ pewien Åe nie, moÅesz kontynuowaÄ.
-
-Czy chcesz kontynuowaÄ uruchamianie Vidalii?</translation>
-    </message>
-    <message>
-        <location filename="../main.cpp" line="72"/>
-        <source>Invalid Argument</source>
-        <translation>BÅÄdny parametr.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="161"/>
-        <source>Displays this usage message and exits.</source>
-        <translation>WyÅwietla tÄ wiadomoÅÄ i wychodzi.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="163"/>
-        <source>Resets ALL stored Vidalia settings.</source>
-        <translation>CzyÅci WSZYSTKIE ustawienia Vidalii.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="165"/>
-        <source>Sets the directory Vidalia uses for data files.</source>
-        <translation>Ustawia katalog, ktÃrego Vidalia uÅywa do zapisu danych.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="167"/>
-        <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
-        <translation>Ustawia nazwÄ i poÅoÅenie pliku pidfile.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="169"/>
-        <source>Sets the name and location of Vidalia&apos;s logfile.</source>
-        <translation>Ustawia nazwÄ i poÅoÅenie pliku logÃw Vidalii.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="172"/>
-        <source>Sets the verbosity of Vidalia&apos;s logging.</source>
-        <translation>Ustawia szczegÃÅowoÅÄ logowania Vidalii.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="175"/>
-        <source>Sets Vidalia&apos;s interface style.</source>
-        <translation>Ustawia styl interfejsu Vidalii.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="178"/>
-        <source>Sets Vidalia&apos;s language.</source>
-        <translation>Ustawia jÄzyk Vidalii.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="182"/>
-        <source>Vidalia Usage Information</source>
-        <translation>Informacja o uÅytkowaniu Vidalii.</translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="243"/>
-        <source>Invalid log level specified: </source>
-        <translation>NieprawidÅowy poziom logowania: </translation>
-    </message>
-    <message>
-        <location filename="../vidalia.cpp" line="249"/>
-        <source>Unable to open log file &apos;%1&apos;: %2</source>
-        <translation>Nie udaÅo siÄ otworzyÄ pliku logu &apos;%1&apos;: %2</translation>
-    </message>
-</context>
-</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>
+</context>
+<context>
+    <name>AboutDialog</name>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="290"/>
+        <source>About Vidalia</source>
+        <translation>O Vidali</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>Wersja Qt</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="528"/>
+        <source>Tor Version</source>
+        <translation>Wersja Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="359"/>
+        <source>Vidalia Version</source>
+        <translation>Wersja Vidali</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.cpp" line="79"/>
+        <source>&lt;Not Running&gt;</source>
+        <translation>&lt;Nie uruchomiono&gt;</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.cpp" line="75"/>
+        <source>&lt;Unavailable&gt;</source>
+        <translation>&lt;NiedostÄpny&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AdvancedPage</name>
+    <message>
+        <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="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>Uruchom Tor&apos;a uÅywajÄc pliku konfiguracyjnego (torrc)</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="644"/>
+        <source>Select path to Tor configuration file</source>
+        <translation>Wybierz ÅcieÅkÄ pliku konfiguracyjnego Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="647"/>
+        <source>Browse</source>
+        <translation>PrzeglÄdaj</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="666"/>
+        <source>Permissions</source>
+        <translation>Uprawnienia</translation>
+    </message>
+    <message>
+        <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="702"/>
+        <source>Vidalia will run with this User&apos;s permissions</source>
+        <translation>Vidalia wykorzysta uprawnienia tego UÅytkownika</translation>
+    </message>
+    <message>
+        <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="729"/>
+        <source>Vidalia will run with this Group&apos;s permissions</source>
+        <translation>Vidalia wykorzysta uprawnienia Grupy</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="119"/>
+        <source>Select Tor Configuration File</source>
+        <translation>Wybierz plik konfiguracyjny Tor&apos;a</translation>
+    </message>
+    <message>
+        <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="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="145"/>
+        <source>Failed to Create File</source>
+        <translation>Nie udaÅo siÄ utworzyÄ pliku</translation>
+    </message>
+    <message>
+        <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="753"/>
+        <source>Service</source>
+        <translation>UsÅuga</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>Zaznacz, jeÅli chcesz uruchamiaÄ Tor&apos;a jako usÅugÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="771"/>
+        <source>Run Tor in the background as a Windows service</source>
+        <translation>Uruchamiaj Tor&apos;a jako usÅugÄ Windows</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="169"/>
+        <source>Unable to remove Tor Service</source>
+        <translation>UsuniÄcie usÅugi Tor&apos;a nie powiodÅo siÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="180"/>
+        <source>Unable to install Tor Service</source>
+        <translation>Instalacja usÅugi Tor&apos;a nie powiodÅa siÄ</translation>
+    </message>
+    <message>
+        <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="171"/>
+        <source>Vidalia was unable to remove the Tor service.
+
+You may need to remove it manually.</source>
+        <translation>Vidalia nie mogÅa usunÄÄ usÅugi Tor&apos;a.
+
+Musisz usunÄÄ jÄ rÄcznie.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="604"/>
+        <source>Tor Configuration File</source>
+        <translation>Plik konfiguracyjny Tor&apos;a</translation>
+    </message>
+    <message>
+        <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&apos;em</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="80"/>
+        <source>&apos;%1&apos; is not a valid IP address.</source>
+        <translation>&apos;%1&apos; nie jest poprawnym adresem IP.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="542"/>
+        <source>IP address on which Tor is listening for controller connections.</source>
+        <translation>Adres IP na ktÃrym nasÅuchuje Tor.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="549"/>
+        <source>:</source>
+        <translation>:</translation>
+    </message>
+</context>
+<context>
+    <name>AppearancePage</name>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="301"/>
+        <source>Language</source>
+        <translation>JÄzyk</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="322"/>
+        <source>Choose the language used in Vidalia</source>
+        <translation>Wybierz jÄzyk aplikacji</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="354"/>
+        <source>Changes to language will only take effect after restarting Vidalia!</source>
+        <translation>Zmiana jÄzyka przyniesie efekt dopiero po restarcie programu!</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="370"/>
+        <source>Style</source>
+        <translation>Styl</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="404"/>
+        <source>Choose Vidalia&apos;s interface style</source>
+        <translation>Wybierz styl interfejsu</translation>
+    </message>
+</context>
+<context>
+    <name>BandwidthGraph</name>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="490"/>
+        <source>Tor Bandwidth Usage</source>
+        <translation>UÅycie ÅÄcza</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="514"/>
+        <source>Show Settings</source>
+        <translation>PokaÅ ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="537"/>
+        <source>Reset</source>
+        <translation>Resetuj</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="630"/>
+        <source>Receive Rate</source>
+        <translation>PokaÅ ÅciÄganie</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="654"/>
+        <source>Send Rate</source>
+        <translation>PokaÅ wysyÅanie</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="773"/>
+        <source>Changes the transparency of the Bandwidth Graph</source>
+        <translation>Zmienia przezroczystoÅÄ okna</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="932"/>
+        <source>Save</source>
+        <translation>Zapisz</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="939"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.cpp" line="170"/>
+        <source>Since:</source>
+        <translation>Wykres od:</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>% Nieprzejrzyste</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.cpp" line="236"/>
+        <source>Hide Settings</source>
+        <translation>Ukryj ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="667"/>
+        <source>Always on Top</source>
+        <translation>Na wierzchu</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="723"/>
+        <source>Style</source>
+        <translation>Styl</translation>
+    </message>
+</context>
+<context>
+    <name>Circuit</name>
+    <message>
+        <location filename="../control/circuit.cpp" line="109"/>
+        <source>New</source>
+        <translation>Nowe</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="110"/>
+        <source>Open</source>
+        <translation>Aktywne</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="111"/>
+        <source>Building</source>
+        <translation>ÅÄczenie</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="112"/>
+        <source>Failed</source>
+        <translation>Nie powiodÅo siÄ</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="113"/>
+        <source>Closed</source>
+        <translation>ZakoÅczone</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="114"/>
+        <source>Unknown</source>
+        <translation>Nieznane</translation>
+    </message>
+</context>
+<context>
+    <name>CircuitItem</name>
+    <message>
+        <location filename="../gui/network/circuititem.cpp" line="48"/>
+        <source>&lt;Path Empty&gt;</source>
+        <translation>&lt;ÅcieÅka pusta&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>CircuitListWidget</name>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
+        <source>Connection</source>
+        <translation>PoÅÄczenie</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
+        <source>Status</source>
+        <translation>Status</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="56"/>
+        <source>Close Circuit</source>
+        <translation>Zamknij poÅÄczenie</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="62"/>
+        <source>Close Stream</source>
+        <translation>Zamknij strumieÅ</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="55"/>
+        <source>Zoom to Circuit</source>
+        <translation>ZbliÅ poÅÄczenie</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDialog</name>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="56"/>
+        <source>General</source>
+        <translation>OgÃlne</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="59"/>
+        <source>Server</source>
+        <translation>Serwer</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="65"/>
+        <source>Advanced</source>
+        <translation>Zaawansowane</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="83"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="62"/>
+        <source>Appearance</source>
+        <translation>WyglÄd</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="78"/>
+        <source>Save</source>
+        <translation>Zapisz</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="154"/>
+        <source>Error Saving Configuration</source>
+        <translation>BÅad zapisywania konfiguracji</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="74"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.ui" line="289"/>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
+    </message>
+</context>
+<context>
+    <name>ControlConnection</name>
+    <message>
+        <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="239"/>
+        <source>Control socket is not connected</source>
+        <translation>Gniazdo sterujÄce nie jest podÅÄczone</translation>
+    </message>
+</context>
+<context>
+    <name>ControlSocket</name>
+    <message>
+        <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="101"/>
+        <source>Error disconnecting socket. [%1]</source>
+        <translation>BÅÄd przy rozÅÄczaniu gniazda. [%1]</translation>
+    </message>
+    <message>
+        <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="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="234"/>
+        <source>Invalid control reply. [%1]</source>
+        <translation>NieprawidÅowy kod odpowiedzi. [%1]</translation>
+    </message>
+    <message>
+        <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="81"/>
+        <source>Vidalia was unable to determine Tor&apos;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&apos;a. SprawdÅ, czy numer portu jest ustawiony poprawnie i Åe posiadasz uruchomionÄ najnowszÄ wersjÄ Tor&apos;a.</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="85"/>
+        <source>Vidalia only supports Version 1 of Tor&apos;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>
+    </message>
+</context>
+<context>
+    <name>GeneralPage</name>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="334"/>
+        <source>Path to Tor&apos;s executable</source>
+        <translation>ÅcieÅka do pliku wykonywalnego Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="353"/>
+        <source>Select path to Tor executable</source>
+        <translation>Wybierz ÅcieÅkÄ do pliku wykonywalnego Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="356"/>
+        <source>Browse</source>
+        <translation>PrzeglÄdaj</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="375"/>
+        <source>Startup Options</source>
+        <translation>Opcje startowe</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="390"/>
+        <source>Select to start Vidalia on system boot</source>
+        <translation>Zaznacz, aby Vidalia uruchamiaÅa siÄ zawsze automatycznie.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="393"/>
+        <source>Run Vidalia on system startup</source>
+        <translation>Uruchom VidaliÄ przy starcie systemu</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="406"/>
+        <source>Set to start Tor when you launch Vidalia</source>
+        <translation>Zaznacz, aby Vidalia sama uruchamiaÅa Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="409"/>
+        <source>Start Tor when Vidalia starts</source>
+        <translation>WÅÄczaj Tor&apos;a gdy Vidalia startuje</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.cpp" line="72"/>
+        <source>Select Path to Tor</source>
+        <translation>Wybierz ÅcieÅkÄ do Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="307"/>
+        <source>Tor Executable</source>
+        <translation>Plik wykonywalny Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.cpp" line="63"/>
+        <source>Executables (*.exe)</source>
+        <translation>Pliki wykonywalne (.exe)</translation>
+    </message>
+</context>
+<context>
+    <name>GraphFrame</name>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="248"/>
+        <source>Recv: </source>
+        <translation>Odbr:</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="257"/>
+        <source>Sent: </source>
+        <translation>WysÅ:</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="269"/>
+        <source>%1 KB</source>
+        <translation>%1 KB</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="272"/>
+        <source>%1 MB</source>
+        <translation>%1 MB</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="275"/>
+        <source>%1 GB</source>
+        <translation>%1 GB</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="296"/>
+        <source>%1 KB/s</source>
+        <translation>%1 KB/s</translation>
+    </message>
+</context>
+<context>
+    <name>HelpBrowser</name>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="303"/>
+        <source>Vidalia Help</source>
+        <translation>Pomoc Vidalii</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="449"/>
+        <source>Find Previous</source>
+        <translation>ZnajdÅ poprzednie</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="462"/>
+        <source>Find Next</source>
+        <translation>ZnajdÅ nastÄpne</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="496"/>
+        <source>Case sensitive</source>
+        <translation>WaÅna wielkoÅÄ liter</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="535"/>
+        <source>Contents</source>
+        <translation>ZawartoÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="580"/>
+        <source>Help Topics</source>
+        <translation>Tematy pomocy</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="625"/>
+        <source>Search</source>
+        <translation>Szukaj</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="680"/>
+        <source>Found Documents</source>
+        <translation>Znalezione dokumenty</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="759"/>
+        <source>Back</source>
+        <translation>Cofnij</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="762"/>
+        <source>Move to previous page (Backspace)</source>
+        <translation>PrzejdÅ do poprzedniej strony (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>W przÃd</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="781"/>
+        <source>Move to next page (Shift+Backspace)</source>
+        <translation>PrzejdÅ do nastÄpnej strony (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>GÅÃwna</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="800"/>
+        <source>Move to the Home page (Ctrl+H)</source>
+        <translation>PrzejdÅ do strony gÅÃwnej</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>ZnajdÅ</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>Szuka sÅowa lub sÅÃw na bieÅÄcej stronie (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>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="847"/>
+        <source>Close Vidalia Help</source>
+        <translation>Zamknij pomoc Vidalii</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>BÅÄd wczytywania zawartoÅci pomocy: </translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="372"/>
+        <source>Search reached end of document</source>
+        <translation>Wyszukiwanie dotarÅo do koÅca dokumentu</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="374"/>
+        <source>Search reached start of document</source>
+        <translation>Wyszukiwanie dotarÅo do poczÄtku dokumentu</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="376"/>
+        <source>Text not found in document</source>
+        <translation>Nie znaleziono tekstu w dokumencie</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="427"/>
+        <source>Find:</source>
+        <translation>ZnajdÅ:</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="506"/>
+        <source>Whole words only</source>
+        <translation>Tylko caÅe sÅowa</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="637"/>
+        <source>Searching for:</source>
+        <translation>Szukanie:</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="133"/>
+        <source>Supplied XML file is not a valid Contents document.</source>
+        <translation>Plik XML nie jest prawidÅowym plikiem dokumentu ZawartoÅci.</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="421"/>
+        <source>Found %1 results</source>
+        <translation>Znaleziono %1 wynik(i/Ãw)</translation>
+    </message>
+</context>
+<context>
+    <name>HelpTextBrowser</name>
+    <message>
+        <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
+        <source>Error opening help file: </source>
+        <translation>BÅÄd otwierania pliku pomocy: </translation>
+    </message>
+</context>
+<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>Informacja</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="70"/>
+        <source>Notice</source>
+        <translation>Powiadomienie</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="71"/>
+        <source>Warning</source>
+        <translation>OstrzeÅenie</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="72"/>
+        <source>Error</source>
+        <translation>BÅÄd</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="73"/>
+        <source>Unknown</source>
+        <translation>Nieznany</translation>
+    </message>
+</context>
+<context>
+    <name>LogTreeWidget</name>
+    <message>
+        <location filename="../gui/log/logtreewidget.cpp" line="40"/>
+        <source>Messages Shown: </source>
+        <translation>WiadomoÅci:</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <source>Messages Shown: %1</source>
+        <translation>WiadomoÅci: %1</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="239"/>
+        <source>Tor is Stopped</source>
+        <translation type="obsolete">Tor jest zatrzymany</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="194"/>
+        <source>Start</source>
+        <translation type="obsolete">Uruchom</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="198"/>
+        <source>Stop</source>
+        <translation type="obsolete">Zatrzymaj</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="356"/>
+        <source>About</source>
+        <translation>Informacje</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="369"/>
+        <source>Exit</source>
+        <translation>WyjdÅ</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="230"/>
+        <source>Bandwidth Graph</source>
+        <translation>ZuÅycie ÅÄcza</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="243"/>
+        <source>Message Log</source>
+        <translation>Dziennik LogÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="293"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="285"/>
+        <source>Ctrl+S</source>
+        <translation type="obsolete">Ctrl+S</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <source>Ctrl+?</source>
+        <translation>Ctrl+?</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <source>File</source>
+        <translation>Plik</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <source>View</source>
+        <translation>Widok</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <source>Vidalia Help</source>
+        <translation>Pomoc Vidalii</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <source>Error Starting Tor</source>
+        <translation>BÅÄd uruchamiania Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <source>Error Connecting to Tor</source>
+        <translation>BÅÄd podÅÄczenia do Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <source>Error Stopping Tor</source>
+        <translation>BÅad zatrzymywania Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="491"/>
+        <source>Tor is stopped</source>
+        <translation type="obsolete">Tor jest zatrzymany</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <source>Tor Exited</source>
+        <translation>Tor wyÅÄczony</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <source>Vidalia was unable to stop Tor.</source>
+        <translation>Vidalia nie mogÅa zatrzymaÄ Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="394"/>
+        <source>Tor is starting</source>
+        <translation type="obsolete">Uruchamianie Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <source>Tor is running</source>
+        <translation>Tor aktywny</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <source>Server is Enabled</source>
+        <translation>Serwer uaktywniony</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="467"/>
+        <source>Tor is stopping</source>
+        <translation type="obsolete">Zatrzymywanie Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <source>Error Applying Server Settings</source>
+        <translation>Aktualizacja ustawieÅ serwera nie powiodÅa siÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <source>Vidalia was unable to apply your server&apos;s settings.</source>
+        <translation>Vidalia nie byÅa w stanie zaktualizowaÄ ustawieÅ Twojego serwera</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
+        <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
+
+Would you like to shutdown gracefully and give clients time to find a new server?</source>
+        <translation>Posiadasz uruchomiony serwer Tor&apos;a. WyÅÄczenie go spowoduje przerwanie wszelkich poÅÄczeÅ z klientami.
+
+Czy chciaÅbyÅ dokonaÄ tego elegancko, dajÄc klientom czas na znalezienie nowego serwera?</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
+        <source>Vidalia detected that Tor exited unexpectedly.
+
+Please check the message log for indicators about what happened to Tor before it exited.</source>
+        <translation>Wykryto niespodziewane zamkniÄcie Tor&apos;a.
+
+ProszÄ sprawdziÄ Dziennik LogÃw, aby zidentyfikowaÄ przyczynÄ.</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
+        <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 nie mogÅa uruchomiÄ Tor&apos;a. ProszÄ sprawdziÄ ustawienia, aby upewniÄ siÄ co do ÅcieÅki dostÄpu do pliku wykonywalnego Tor&apos;a.</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
+        <source>Network Map</source>
+        <translation>Mapa Sieci</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="306"/>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <source>New Identity</source>
+        <translation>Nowa ToÅsamoÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <source>All subsequent connections will appear to be different than your old connections.</source>
+        <translation>Wszystkie nastÄpne poÅÄczenia bÄdÄ inne niÅ Twoje obecne.</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
+        <source>Failed to Create New Identity</source>
+        <translation>Tworzenie nowej toÅsamoÅci nie powiodÅo siÄ.</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
+</context>
+<context>
+    <name>MessageLog</name>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="289"/>
+        <source>Message Log</source>
+        <translation>Dziennik LogÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="336"/>
+        <source>Time</source>
+        <translation>Czas</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="341"/>
+        <source>Type</source>
+        <translation>Typ</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="346"/>
+        <source>Message</source>
+        <translation>WiadomoÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="646"/>
+        <source>Browse</source>
+        <translation>PrzeglÄdaj</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="430"/>
+        <source>Saves the current Message Log settings</source>
+        <translation>Zapisuje bieÅÄce ustawienia Dziennika LogÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="433"/>
+        <source>Save Settings</source>
+        <translation>Zapisz ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="449"/>
+        <source>Cancels changes made to settings</source>
+        <translation>Anuluje zmiany dokonane w ustawieniach</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="452"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="466"/>
+        <source>Message Filter</source>
+        <translation>Filtr wiadomoÅci</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="487"/>
+        <source>Error</source>
+        <translation>BÅÄd</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="503"/>
+        <source>Warning</source>
+        <translation>OstrzeÅenie</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="519"/>
+        <source>Notice</source>
+        <translation>Powiadomienie</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="535"/>
+        <source>Info</source>
+        <translation>Informacja</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="551"/>
+        <source>Debug</source>
+        <translation>Systemowe</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="727"/>
+        <source>Message Filters...</source>
+        <translation>Filtry wiadomoÅci...</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="730"/>
+        <source>Set message filters</source>
+        <translation>Ustawia filtrowanie wiadomoÅci</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="743"/>
+        <source>History Size...</source>
+        <translation>Rozmiar historii...</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="746"/>
+        <source>Set maximum number of messages to display</source>
+        <translation>Ustawia maksymalnÄ liczbÄ wyÅwietlanych wiadomoÅci</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="762"/>
+        <source>Clear</source>
+        <translation>WyczyÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="765"/>
+        <source>Clear all messages from the Message Log (Ctrl+E)</source>
+        <translation>CzyÅci wszystkie wiadomoÅci z Dziennika LogÃw (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>Kopiuj</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="790"/>
+        <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
+        <translation>Kopiuje zaznaczone wiadomoÅci do schowka (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>Zaznacz wszystkie</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="812"/>
+        <source>Select all messages (Ctrl+A)</source>
+        <translation>Zaznacza wszystkie wiadomoÅci (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>Zapisz wszystkie</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="831"/>
+        <source>Save all messages to a file</source>
+        <translation>Zapisuje wszystkie wiadomoÅci do pliku</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="844"/>
+        <source>Save Selected</source>
+        <translation>Zapisz wybrane</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="847"/>
+        <source>Save selected messages to a file</source>
+        <translation>Zapisuje zaznaczone wiadomoÅci do pliku</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="901"/>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="904"/>
+        <source>Close the Message Log</source>
+        <translation>Zamyka Dziennik LogÃw</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>ZnajdÅ</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="926"/>
+        <source>Find all messages containing the search text (Ctrl+F)</source>
+        <translation>Znajduje wszystkie wiadomoÅci zawierajÄce szukany tekst (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>WiadomoÅci informujÄce o wystÄpieniu
+powaÅnych bÅedÃw, uniemoÅliwiajÄcych dalszÄ pracÄ.</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>WiadomoÅci informujÄce
+o bÅÄdach Tor&apos;a</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 
+care about.</source>
+        <translation>WiadomoÅci informujÄce o zdarzeniach
+nie bÄdÄcych bÅÄdami, lecz mogÄ one byÄ istotne.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="156"/>
+        <source>Messages that appear frequently 
+during normal Tor operation.</source>
+        <translation>WiadomoÅci dotyczÄce prawidÅowej
+pracy Tor&apos;a.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="158"/>
+        <source>Hyper-verbose messages primarily of 
+interest to Tor developers.</source>
+        <translation>Bardzo szczegÃÅowe informacje,
+dla programistÃw ekipy Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="203"/>
+        <source>Error Setting Filter</source>
+        <translation>BÅÄd ustawiania filtru</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="219"/>
+        <source>Error Opening Log File</source>
+        <translation>BÅÄd otwierania pliku logÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="294"/>
+        <source>Select Log File</source>
+        <translation>Wybierz plik z Logami</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="311"/>
+        <source>Save Log Messages</source>
+        <translation>Zapisz Logi</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>Wyszukaj wiadomoÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="377"/>
+        <source>Find:</source>
+        <translation>ZnajdÅ:</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="383"/>
+        <source>Not Found</source>
+        <translation>Nie znaleziono</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="384"/>
+        <source>Search found 0 matches.</source>
+        <translation>Znaleziono 0 pasujÄcych.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="863"/>
+        <source>Settings</source>
+        <translation>Ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="866"/>
+        <source>Adjust Message Log Settings</source>
+        <translation>Zmienia ustawienia LogÃw</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>Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="885"/>
+        <source>Show the help browser</source>
+        <translation>Pokazuje przeglÄdarkÄ Pomocy</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="204"/>
+        <source>Vidalia was unable to register for Tor&apos;s log events.</source>
+        <translation>Vidalia nie mogÅa zarejestrowaÄ siÄ jako odbiorca logÃw Tor&apos;a</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="324"/>
+        <source>Cannot write file %1
+
+%2.</source>
+        <translation>BÅÄd zapisu pliku %1
+
+%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 nie mogÅa otworzyÄ wskazanego pliku LogÃw.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="314"/>
+        <source>Text Files (*.txt)</source>
+        <translation>Pliki tekstowe (*.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>Wymagana nazwa pliku loga</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>Musisz wpisaÄ nazwÄ pliku, aby mÃc zapisywaÄ wiadomoÅci do pliku.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="567"/>
+        <source>Message Log History</source>
+        <translation>Historia LogÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="588"/>
+        <source>Number of messages to display in the message log window</source>
+        <translation>Liczba wiadomoÅci wyÅwietlanych w oknie logÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="612"/>
+        <source>messages</source>
+        <translation>wiadomoÅci</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="631"/>
+        <source>Always Save New Log Messages</source>
+        <translation>Zawsze zapisuj nowe wiadomoÅci</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="669"/>
+        <source>Enable automatically saving all new log messages to a file</source>
+        <translation>WÅÄcz automatyczne zapisywanie wszystkich nowych wiadomoÅci d pliku</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="672"/>
+        <source>Automatically save new log messages to a file</source>
+        <translation>Automatycznie zapisuj wiadomoÅci do pliku</translation>
+    </message>
+</context>
+<context>
+    <name>NetViewer</name>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="297"/>
+        <source>View Tor Network</source>
+        <translation>Widok Sieci Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="518"/>
+        <source>Refresh</source>
+        <translation>OdÅwieÅ</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="540"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="562"/>
+        <source>Close</source>
+        <translation>Zamknij</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="584"/>
+        <source>Zoom In</source>
+        <translation>ZbliÅenie</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="606"/>
+        <source>Zoom Out</source>
+        <translation>Oddalenie</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="524"/>
+        <source>Refresh the list of routers and connections</source>
+        <translation>OdÅwieÅa listÄ ruterÃw i poÅaczeÅ</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="543"/>
+        <source>Show network map help</source>
+        <translation>Pokazuje pomoc dla Widoku Sieci</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="546"/>
+        <source>Show the network map help</source>
+        <translation>Pokazuje pomoc dla Widoku Sieci</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="568"/>
+        <source>Close the network map</source>
+        <translation>Zamyka Widok Sieci</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="590"/>
+        <source>Zoom in on the network map</source>
+        <translation>PowiÄksza widok na mapie</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="612"/>
+        <source>Zoom out on the network map</source>
+        <translation>Pomniejsza widok na mapie</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="628"/>
+        <source>Zoom To Fit</source>
+        <translation>PokaÅ caÅoÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="634"/>
+        <source>Zooms to fit all currently displayed circuits</source>
+        <translation>Ustaw powiÄkszenie tak, aby objÄÄ wszystkie poÅÄczenia</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>
+</context>
+<context>
+    <name>Policy</name>
+    <message>
+        <location filename="../config/policy.cpp" line="178"/>
+        <source>accept</source>
+        <translation>akceptuj</translation>
+    </message>
+    <message>
+        <location filename="../config/policy.cpp" line="178"/>
+        <source>reject</source>
+        <translation>odrzuÄ</translation>
+    </message>
+</context>
+<context>
+    <name>RouterDescriptor</name>
+    <message>
+        <location filename="../control/routerdescriptor.cpp" line="87"/>
+        <source>Online</source>
+        <translation>DziaÅa</translation>
+    </message>
+    <message>
+        <location filename="../control/routerdescriptor.cpp" line="89"/>
+        <source>Hibernating</source>
+        <translation>UÅpiony</translation>
+    </message>
+    <message>
+        <location filename="../control/routerdescriptor.cpp" line="91"/>
+        <source>Offline</source>
+        <translation>WyÅÄczony</translation>
+    </message>
+</context>
+<context>
+    <name>RouterDescriptorView</name>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
+        <source>IP Address:</source>
+        <translation>Adres IP:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
+        <source>Platform:</source>
+        <translation>Platforma:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
+        <source>Bandwidth:</source>
+        <translation>PrzepustowoÅÄ:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
+        <source>Uptime:</source>
+        <translation>DziaÅa:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
+        <source>Last Updated:</source>
+        <translation>Aktualizacja:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
+        <source>Location:</source>
+        <translation>Lokalizacja:</translation>
+    </message>
+</context>
+<context>
+    <name>RouterListItem</name>
+    <message>
+        <location filename="../gui/network/routerlistitem.cpp" line="94"/>
+        <source>%1 KB/s</source>
+        <translation>%1 KB/s</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerlistitem.cpp" line="78"/>
+        <source>Offline</source>
+        <translation>WyÅÄczony</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerlistitem.cpp" line="82"/>
+        <source>Hibernating</source>
+        <translation>UÅpiony</translation>
+    </message>
+</context>
+<context>
+    <name>RouterListWidget</name>
+    <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
+        <source>Server</source>
+        <translation>Serwer</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
+        <source>Zoom to Server</source>
+        <translation>PrzybliÅ serwer</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
+        <source>%1 servers online (%2 total)</source>
+        <translation>%1 serwerÃw aktywnych (%2 wszystkich)</translation>
+    </message>
+</context>
+<context>
+    <name>ServerPage</name>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="502"/>
+        <source>Check to run as a Tor network server</source>
+        <translation>Zaznacz, aby uruchomiÄ serwer sieci Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="505"/>
+        <source>Relay traffic for the Tor network</source>
+        <translation>UdostÄpnij moje ÅÄcze dla sieci Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="716"/>
+        <source>Directory Port:</source>
+        <translation>Port Listy:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="746"/>
+        <source>Directory Port Number</source>
+        <translation>Numer portu Listy SerwerÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="616"/>
+        <source>Nickname:</source>
+        <translation>Ksywa:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="821"/>
+        <source>Name of your server</source>
+        <translation>Nazwa Twojego serwera</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="684"/>
+        <source>Contact Info:</source>
+        <translation>Kontakt:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="638"/>
+        <source>Server Port:</source>
+        <translation>Port serwera:</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>Port na ktÃrym uÅytkownicy i inne serwery komunikujÄ siÄ z Twoim</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="565"/>
+        <source>Address:</source>
+        <translation>Adres:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="781"/>
+        <source>Domain name or IP address of your server</source>
+        <translation>Nazwa domeny albo adres IP Twojego serwera</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="837"/>
+        <source>Enable to mirror the server directory</source>
+        <translation>WÅÄcza zapamiÄtywanie listy serwerÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="840"/>
+        <source>Mirror the Server Directory </source>
+        <translation>Przechowuj ListÄ SerwerÃw </translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="590"/>
+        <source>Attempts to determine the correct address for your server</source>
+        <translation>PrÃbuje ustaliÄ adres Twojego serwera</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="593"/>
+        <source>Get Address</source>
+        <translation>Pobierz adres</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1251"/>
+        <source>Exit Policies</source>
+        <translation>Polityka poÅÄczeÅ</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1377"/>
+        <source>Show help topic on exit policies</source>
+        <translation>Pokazuje pomoc dotyczÄcÄ reguÅ</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.cpp" line="148"/>
+        <source>You must specify at least a server nickname and port.</source>
+        <translation>Musisz podaÄ nazwÄ serwera oraz port.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.cpp" line="232"/>
+        <source>Error</source>
+        <translation>BÅÄd</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.cpp" line="233"/>
+        <source>Vidalia was unable to determine your public IP address.</source>
+        <translation>Vidalia nie mogÅa ustaliÄ Twojego publicznego adresu 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>
+        <translation>Vidalia ustaliÅa tylko wewnÄtrzny adres IP twojego servera.
+
+Czy chciaÅbyÅ skorzystaÄ z zewnÄtrznego ÅrÃdÅa aby ustaliÄ adres TwÃj publiczny ?</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>Gdy zaznaczone, Vidalia bÄdzie sprawdzaÄ TwÃj aktualny adres IP, jeÅli zajdzie potrzeba</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="853"/>
+        <source>Automatically Update</source>
+        <translation>Aktualizuj automatycznie</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>
+        <translation>Adres e-mail pod ktÃrym jesteÅ dostÄpny, gdy wystÄpi problem z Twoim serwerem. MoÅesz rÃwnieÅ zaÅÄczyÄ swoje klucze publiczne PGP lub GPG.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1107"/>
+        <source>Long-term average bandwidth limit</source>
+        <translation>DÅugookresowa Årednia przepustowoÅÄ Twojego ÅÄcza</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1078"/>
+        <source>Average Rate</source>
+        <translation>Årednia przepustowoÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1195"/>
+        <source>KB/s</source>
+        <translation>KB/s</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1182"/>
+        <source>Peak bandwidth rate limit</source>
+        <translation>Szczytowa przepustowoÅÄ Twojego ÅÄcza</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1153"/>
+        <source>Maximum Rate</source>
+        <translation>Maksymalna przepustowoÅÄ</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="989"/>
+        <source>Show help topic on bandwidth rate limits</source>
+        <translation>Pokazuje pomoc na temat limitÃw przepustowoÅci</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="537"/>
+        <source>Basic Settings</source>
+        <translation>Ustawienia podstawowe</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="887"/>
+        <source>Bandwidth Limits</source>
+        <translation>Limity przepustowoÅci</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>Dla poÅÄczeÅ o wysokiej prÄdkoÅci ÅciÄgania a niskiej wysyÅania, proszÄ wybraÄ typ o zbliÅonej prÄdkoÅci wysyÅania.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="943"/>
+        <source>Select the entry that most closely resembles your Internet connection</source>
+        <translation>Wybierz typ najdokÅadniej opisujÄcy Twoje poÅÄczenie Internetowe</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="953"/>
+        <source>Cable/DSL 256 Kbps</source>
+        <translation>Cable/DSL 256 Kbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="958"/>
+        <source>Cable/DSL 512 Kbps</source>
+        <translation>Cable/DSL 512 Kbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="963"/>
+        <source>Cable/DSL 768 Kbps</source>
+        <translation>Cable/DSL 768 Kbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="968"/>
+        <source>T1/Cable/DSL 1.5 Mbps</source>
+        <translation>T1/Cable/DSL 1.5 Mbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="973"/>
+        <source>&gt; 1.5 Mbps</source>
+        <translation>&gt; 1.5 Mbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="978"/>
+        <source>Custom</source>
+        <translation>Inny</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1289"/>
+        <source>Ports 6660 - 6669 and 6697</source>
+        <translation>Porty 6660 - 6669 i 6697</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1292"/>
+        <source>Internet Relay Chat (IRC)</source>
+        <translation>UsÅuga IRC</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1302"/>
+        <source>Ports 110, 143, 993 and 995</source>
+        <translation>Porty 110, 143, 993 i 995</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1305"/>
+        <source>Retrieve Mail (POP, IMAP)</source>
+        <translation>Odbieranie maili (POP, IMAP)</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1315"/>
+        <source>Ports unspecified by other checkboxes</source>
+        <translation>PozostaÅe niewymienione porty</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1318"/>
+        <source>Misc Other Services</source>
+        <translation>Inne usÅugi</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1328"/>
+        <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
+        <translation>Porty 706, 1863, 5050, 5190, 5222, 8300 i 8888</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1331"/>
+        <source>Instant Messaging (IM)</source>
+        <translation>Komunikatory internetowe</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1341"/>
+        <source>Port 443</source>
+        <translation>Port 443</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1344"/>
+        <source>Secure Websites (SSL)</source>
+        <translation>Bezpieczne witryny (SSL)</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1354"/>
+        <source>Port 80</source>
+        <translation>Port 80</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1357"/>
+        <source>Websites</source>
+        <translation>Strony WWW</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>Do jakich zasobÃw Internetu bÄdÄ mieli dostÄp uÅytkownicy Tor&apos;a korzystajÄcy z Twojego serwera?</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>Twoja maksymalna przepustowoÅÄ musi byÄ wiÄksza lub rÃwna Åredniej przepustowoÅci. Obie wartoÅci muszÄ wynosiÄ co najmniej 20 KB/s.</translation>
+    </message>
+</context>
+<context>
+    <name>Stream</name>
+    <message>
+        <location filename="../control/stream.cpp" line="110"/>
+        <source>New</source>
+        <translation>Nowy</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="112"/>
+        <source>Resolving</source>
+        <translation>Analizowanie</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="113"/>
+        <source>Connecting</source>
+        <translation>ÅÄczenie</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="114"/>
+        <source>Open</source>
+        <translation>Otwarty</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="115"/>
+        <source>Failed</source>
+        <translation>BÅÄd</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="116"/>
+        <source>Closed</source>
+        <translation>ZamkniÄty</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="118"/>
+        <source>Unknown</source>
+        <translation>Nieznany</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="117"/>
+        <source>Retrying</source>
+        <translation>PowtÃrna prÃba</translation>
+    </message>
+</context>
+<context>
+    <name>TorProcess</name>
+    <message>
+        <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>
+</context>
+<context>
+    <name>TorService</name>
+    <message>
+        <location filename="../control/torservice.cpp" line="155"/>
+        <source>The Tor service is not installed.</source>
+        <translation>UsÅuga Tor&apos;a nie jest zainstalowana.</translation>
+    </message>
+    <message>
+        <location filename="../control/torservice.cpp" line="173"/>
+        <source>Unable to start the Tor service.</source>
+        <translation>Uruchomienie usÅugi Tor nie powiodÅo siÄ.</translation>
+    </message>
+</context>
+<context>
+    <name>VMessageBox</name>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="88"/>
+        <source>OK</source>
+        <translation>OK</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="89"/>
+        <source>Cancel</source>
+        <translation>Anuluj</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="90"/>
+        <source>Yes</source>
+        <translation>Tak</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="91"/>
+        <source>No</source>
+        <translation>Nie</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="92"/>
+        <source>Help</source>
+        <translation>Pomoc</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="93"/>
+        <source>Retry</source>
+        <translation>PonÃw</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="94"/>
+        <source>Show Log</source>
+        <translation>PokaÅ log</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="95"/>
+        <source>Show Settings</source>
+        <translation>PokaÅ ustawienia</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="96"/>
+        <source>Continue</source>
+        <translation>Kontynuuj</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="97"/>
+        <source>Quit</source>
+        <translation>WyjdÅ</translation>
+    </message>
+</context>
+<context>
+    <name>Vidalia</name>
+    <message>
+        <location filename="../vidalia.cpp" line="230"/>
+        <source>Invalid language code specified: </source>
+        <translation>OkreÅlono nieprawidÅowy kod jÄzyka: </translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="237"/>
+        <source>Invalid GUI style specified: </source>
+        <translation>Wybrano niewÅaÅciwy styl GUI: </translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="86"/>
+        <source>Vidalia is already running</source>
+        <translation>Vidalia jest juÅ uruchomiona</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>
+        <translation>Inny proces Vidalii jest prawdopodobnie juÅ uruchomiony. JeÅli jesteÅ pewien Åe nie, moÅesz kontynuowaÄ.
+
+Czy chcesz kontynuowaÄ uruchamianie Vidalii?</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="72"/>
+        <source>Invalid Argument</source>
+        <translation>BÅÄdny parametr.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="161"/>
+        <source>Displays this usage message and exits.</source>
+        <translation>WyÅwietla tÄ wiadomoÅÄ i wychodzi.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="163"/>
+        <source>Resets ALL stored Vidalia settings.</source>
+        <translation>CzyÅci WSZYSTKIE ustawienia Vidalii.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="165"/>
+        <source>Sets the directory Vidalia uses for data files.</source>
+        <translation>Ustawia katalog, ktÃrego Vidalia uÅywa do zapisu danych.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="167"/>
+        <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
+        <translation>Ustawia nazwÄ i poÅoÅenie pliku pidfile.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="169"/>
+        <source>Sets the name and location of Vidalia&apos;s logfile.</source>
+        <translation>Ustawia nazwÄ i poÅoÅenie pliku logÃw Vidalii.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="172"/>
+        <source>Sets the verbosity of Vidalia&apos;s logging.</source>
+        <translation>Ustawia szczegÃÅowoÅÄ logowania Vidalii.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="175"/>
+        <source>Sets Vidalia&apos;s interface style.</source>
+        <translation>Ustawia styl interfejsu Vidalii.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="178"/>
+        <source>Sets Vidalia&apos;s language.</source>
+        <translation>Ustawia jÄzyk Vidalii.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="182"/>
+        <source>Vidalia Usage Information</source>
+        <translation>Informacja o uÅytkowaniu Vidalii.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="243"/>
+        <source>Invalid log level specified: </source>
+        <translation>NieprawidÅowy poziom logowania: </translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="249"/>
+        <source>Unable to open log file &apos;%1&apos;: %2</source>
+        <translation>Nie udaÅo siÄ otworzyÄ pliku logu &apos;%1&apos;: %2</translation>
+    </message>
+</context>
+</TS>

Modified: trunk/src/lang/vidalia_pt.ts
===================================================================
--- trunk/src/lang/vidalia_pt.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_pt.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -786,130 +786,130 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>Iniciar</translation>
+        <translation type="obsolete">Iniciar</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>Parar</translation>
+        <translation type="obsolete">Parar</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>GrÃfico de Largura de Banda</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>Log de Mensagens</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>Visualizar</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Ajuda do Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>Erro ao Iniciar o Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>Erro ao Conectar ao Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>Erro ao Parar o Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor Finalizado</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>O Vidalia nÃo pÃde parar o Tor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>O Servidor està habilitado</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>Erro ao Aplicar as ConfiguraÃÃes ao Servidor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>O Vidalia foi incapaz de aplicar as configuraÃÃes do servidor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -918,7 +918,7 @@
 Vocà gostaria de finalizÃ-lo graciosamente e dar tempo aos clientes para que encontrem outro servidor?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -927,65 +927,180 @@
 Por favor verifique o log de mensagens por indicaÃÃes sobre o que ocorreu ao Tor antes da finalizaÃÃo.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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>O Vidalia foi incapaz de iniciar o Tor. Verifique suas configuraÃÃes para garantir o nome e a localizaÃÃo correta do executÃvel do Tor especificado.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="213"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>Mapa da Rede</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>ConfiguraÃÃes</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>Nova Identidade</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>As novas conexÃes irÃo parecer diferentes das conexÃes antigas.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="589"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>Falha ao Criar Nova Identidade</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>O Tor foi parado</translation>
+        <translation type="obsolete">O Tor foi parado</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>O Tor està parando</translation>
+        <translation type="obsolete">O Tor està parando</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>O Tor està iniciando</translation>
+        <translation type="obsolete">O Tor està iniciando</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>O Tor parou</translation>
+        <translation type="obsolete">O Tor parou</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>O Tor està em execuÃÃo</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_ru.ts
===================================================================
--- trunk/src/lang/vidalia_ru.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_ru.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -787,155 +787,155 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>Tor ÐÑÑÐÐÐÐÐÐÐ</translation>
+        <translation type="obsolete">Tor ÐÑÑÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>ÐÐÐÑÑÑÐÑÑ</translation>
+        <translation type="obsolete">ÐÐÐÑÑÑÐÑÑ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>ÐÑÑÐÐÐÐÐÑÑ</translation>
+        <translation type="obsolete">ÐÑÑÐÐÐÐÐÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>Ð ÐÑÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>ÐÑÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>ÐÑÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>ÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>ÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>ÐÑÐÐÐÐ ÐÐÐÑÑÐÐ Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>ÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐÐÐÑ Ð Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <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>
+        <translation type="obsolete">Tor ÐÑÑÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor ÐÐÐÐÑÑÐÐ ÑÐÐÐÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <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>
+        <translation type="obsolete">Tor ÐÐÐÑÑÐÐÐÑÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>Tor ÐÐÐÑÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>ÐÐÑÐÐÑ ÐÐÐÑÑÑÐ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>Tor ÐÑÑÐÐÐÐÐÐÐÐÐÑÑÑ</translation>
+        <translation type="obsolete">Tor ÐÑÑÐÐÐÐÐÐÐÐÐÑÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑ ÑÐÑÐÐÑÐ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <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>
@@ -944,7 +944,7 @@
 ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÑ ÐÐÐÑÑÐÑÐÐ ÐÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ Ð ÐÐÑÑ ÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÑÐÐÑ ÐÐÐÑÐ ÐÑÑÐÐÐ ÑÐÑÐÐÑ?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,40 +953,155 @@
 ÐÐÐÐÐÑÐÑÑÐ ÐÑÐÐÐÑÑÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÐÑÑÐÐÐÐ, ÑÑÐÐÑ ÑÐÐÐÑÑ ÑÑÐ ÐÑÐÐÐÐÑÐÐ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>ÐÐÑÑÐ ÐÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>ÐÐÐÑÐ ÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑ ÐÐÐÐÐÐ ÐÐÐÐ</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_zh-cn.ts
===================================================================
--- trunk/src/lang/vidalia_zh-cn.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_zh-cn.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -784,202 +784,317 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>åå</translation>
+        <translation type="obsolete">åå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>åæ</translation>
+        <translation type="obsolete">åæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>åä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>éå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>æèåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>æææå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>åå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>æä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>æç</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Vidalia åå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>åå Tor æåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>èæå Tor æåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>åæ Tor æåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia ææåæ Tor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>æååæåèåç</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>åçæååèåæåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia ææåçæååèå.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new server?</source>
         <translation>ååæåèèä Tor æååæå.çææååæååääæääåæçèæ.æåèåéæåå?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
         <translation>Vidalia ææå Tor çæåéå.èæçæææåä Tor æåéåçåå.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>ççåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>èå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>ææèä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>ååæèäåè</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>Tor ååæ</translation>
+        <translation type="obsolete">Tor ååæ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>Tor æååæ</translation>
+        <translation type="obsolete">Tor æååæ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>Tor æååå</translation>
+        <translation type="obsolete">Tor æååå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>Tor ååæ</translation>
+        <translation type="obsolete">Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>Tor æåèè</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_zh-tw.ts
===================================================================
--- trunk/src/lang/vidalia_zh-tw.ts	2007-04-08 04:55:23 UTC (rev 1697)
+++ trunk/src/lang/vidalia_zh-tw.ts	2007-04-08 07:06:12 UTC (rev 1698)
@@ -784,202 +784,317 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
-        <translation>åå</translation>
+        <translation type="obsolete">åå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="198"/>
         <source>Stop</source>
-        <translation>åæ</translation>
+        <translation type="obsolete">åæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="221"/>
+        <location filename="../gui/mainwindow.ui" line="356"/>
         <source>About</source>
         <translation>éæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="202"/>
+        <location filename="../gui/mainwindow.ui" line="369"/>
         <source>Exit</source>
         <translation>çæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="205"/>
+        <location filename="../gui/mainwindow.ui" line="230"/>
         <source>Bandwidth Graph</source>
         <translation>æèåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="209"/>
+        <location filename="../gui/mainwindow.ui" line="243"/>
         <source>Message Log</source>
         <translation>èææè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="317"/>
+        <location filename="../gui/mainwindow.ui" line="293"/>
         <source>Help</source>
         <translation>åå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="285"/>
         <source>Ctrl+S</source>
-        <translation>Ctrl+S</translation>
+        <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="286"/>
+        <location filename="../gui/mainwindow.cpp" line="294"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="287"/>
+        <location filename="../gui/mainwindow.cpp" line="295"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="288"/>
+        <location filename="../gui/mainwindow.cpp" line="296"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="290"/>
+        <location filename="../gui/mainwindow.cpp" line="298"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="302"/>
+        <location filename="../gui/mainwindow.cpp" line="310"/>
         <source>File</source>
         <translation>ææ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="305"/>
+        <location filename="../gui/mainwindow.cpp" line="313"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="311"/>
+        <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>View</source>
         <translation>æè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="325"/>
         <source>Vidalia Help</source>
         <translation>Vidalia åå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="365"/>
+        <location filename="../gui/mainwindow.cpp" line="434"/>
         <source>Error Starting Tor</source>
         <translation>åå Tor æççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="409"/>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Error Connecting to Tor</source>
         <translation>éæå Tor æççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="470"/>
+        <location filename="../gui/mainwindow.cpp" line="530"/>
         <source>Error Stopping Tor</source>
         <translation>åæ Tor æççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <location filename="../gui/mainwindow.cpp" line="559"/>
         <source>Tor Exited</source>
         <translation>Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="531"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia çæåæ Tor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="439"/>
+        <location filename="../gui/mainwindow.cpp" line="500"/>
         <source>Server is Enabled</source>
         <translation>äæåæåèåç</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="289"/>
+        <location filename="../gui/mainwindow.cpp" line="297"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="533"/>
+        <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Error Applying Server Settings</source>
         <translation>æçäæåèåæççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="534"/>
+        <location filename="../gui/mainwindow.cpp" line="588"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia çææçäæåèå.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="444"/>
+        <location filename="../gui/mainwindow.cpp" line="505"/>
         <source>You are currently running a Tor server. Terminating your server will interrupt any open connections from clients.
 
 Would you like to shutdown gracefully and give clients time to find a new server?</source>
         <translation>çåæååèç Tor äæåæå.çæäæåæååæäæääåæçéæ.æåèééäæå?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="506"/>
+        <location filename="../gui/mainwindow.cpp" line="562"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
         <translation>Vidalia ææå Tor çæåçæ.èæèèææèä Tor æåçæçåå.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="368"/>
+        <location filename="../gui/mainwindow.cpp" line="437"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="224"/>
         <source>Network Map</source>
         <translation>ççåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="217"/>
+        <location filename="../gui/mainwindow.ui" line="306"/>
         <source>Settings</source>
         <translation>èå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="567"/>
+        <location filename="../gui/mainwindow.cpp" line="650"/>
         <source>New Identity</source>
         <translation>ææèä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="291"/>
+        <location filename="../gui/mainwindow.cpp" line="299"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="570"/>
+        <location filename="../gui/mainwindow.cpp" line="653"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="672"/>
         <source>Failed to Create New Identity</source>
         <translation>ååæèäåæ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation>Tor ååæ</translation>
+        <translation type="obsolete">Tor ååæ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="467"/>
         <source>Tor is stopping</source>
-        <translation>Tor æååæ</translation>
+        <translation type="obsolete">Tor æååæ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation>Tor æååå</translation>
+        <translation type="obsolete">Tor æååå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="491"/>
         <source>Tor is stopped</source>
-        <translation>Tor ååæ</translation>
+        <translation type="obsolete">Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="525"/>
+        <location filename="../gui/mainwindow.cpp" line="359"/>
         <source>Tor is running</source>
         <translation>Tor æååè</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="159"/>
+        <source>Start Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="95"/>
+        <source>Tor is not running</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <source>Tor is shutting down</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <source>Stop Tor</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <source>Tor is starting up</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="33"/>
+        <source>Vidalia Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="63"/>
+        <source>Tor Status</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="135"/>
+        <source>Vidalia Shortcuts</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="169"/>
+        <source>Setup Relaying</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="172"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="182"/>
+        <source>View the Network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="185"/>
+        <source>View a map of the Tor network</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="198"/>
+        <source>Use a New Identity</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="201"/>
+        <source>Make subsequent connections appear new</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="233"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="246"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="296"/>
+        <source>View help documentation</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="309"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="359"/>
+        <source>View version and license information</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="372"/>
+        <source>Exit Vidalia</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="425"/>
+        <source>Show this window on startup</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="444"/>
+        <source>Hide</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="447"/>
+        <source>Hide this window</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>