[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
[vidalia-svn] r1724: lupdate the translations with the last few strings from the (in trunk: . src/lang)

To: vidalia-svn@xxxxxxxx
Subject: [vidalia-svn] r1724: lupdate the translations with the last few strings from the (in trunk: . src/lang)
From: edmanm@xxxxxxxxxxxxxxxxxxx
Date: Thu, 10 May 2007 00:41:01 -0400 (EDT)
Delivered-to: archiver@seul.org
Delivered-to: vidalia-svn-outgoing@seul.org
Delivered-to: vidalia-svn@seul.org
Delivery-date: Thu, 10 May 2007 00:42:41 -0400
Reply-to: vidalia-svn@xxxxxxxxxxxxx
Sender: owner-vidalia-svn@xxxxxxxxxxxxx
Author: edmanm
Date: 2007-05-10 00:41:00 -0400 (Thu, 10 May 2007)
New Revision: 1724

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:
 r1824@adrastea:  edmanm | 2007-05-10 00:42:32 -0400
 lupdate the translations with the last few strings from the new 'control
 panel' dialog.



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

Modified: trunk/src/lang/vidalia_bg.ts
===================================================================
--- trunk/src/lang/vidalia_bg.ts	2007-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_bg.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -774,7 +774,7 @@
         <translation>ÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÐ:</translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>ÐÑÐÐÑÐÐÐÑ ÐÐÐÐÐÐÐÐ: %1</translation>
     </message>
@@ -797,27 +797,27 @@
         <translation type="obsolete">ÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>ÐÑÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>ÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐÑÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>ÐÑÐÐÑÐÐÐÑ ÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑ</translation>
     </message>
@@ -827,57 +827,57 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>ÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>ÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>ÐÐÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>ÐÐÐÐÐÐÐ ÐÐÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÑÑÐÑÑÐÑÐÐÐ ÐÐ ÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÑÐÑÑÐÐÐÐÐ Ñ ÐÐÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÑÐÐÑÐÐÐ ÐÐ ÐÐÑ</translation>
     </message>
@@ -887,12 +887,12 @@
         <translation type="obsolete">ÐÐÑ Ð ÑÐÑÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>ÐÐÑÐÐ ÐÑ ÐÐÑ ÑÑÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÑ ÐÐ ÑÐÑÐ ÐÐÑ.</translation>
     </message>
@@ -902,12 +902,12 @@
         <translation type="obsolete">ÐÐÑ ÑÑÐÑÑÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation type="unfinished">ÐÐÑ ÑÐÐÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>ÐÑÑÐÑÑÑÑ Ð ÐÐÐÑÑÐÐ</translation>
     </message>
@@ -917,22 +917,22 @@
         <translation type="obsolete">ÐÐÑ ÑÐÐÑÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>ÐÑÐÑÐÐ ÐÑÐ ÐÑÐÐÐÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>ÐÐÐÐÐÐÐ ÐÐ ÑÑÐÑ ÐÐ ÐÑÐÐÐÐÐ ÑÐÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐ ÑÑÑÐÑÑÐ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -950,155 +950,176 @@
 ÐÐÐÑ ÐÑÐÐÐÑÐÑÐ ÐÐÐ ÑÐÐÐÐ ÑÑÑ ÑÑÐÐÑÐÐÐÑÑÐ ÐÐ ÐÐÑÐÑÐÐÑÐÑ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>ÐÐÑÑÐ ÐÑÐÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>ÐÐÑÐÐ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>ÐÐÐÐ ÑÐÐÐÐÐÑÐÐÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>ÐÑÐÑÐÐ ÐÐÑÐÐÐÐÐÑÐ ÐÑÑÐÐÐ ÑÐ ÐÐÐÐÐÐÐÐÑ ÑÐÐÐÐÑÐÐ ÐÑ ÑÑÐÑÐÑÐ ÐÐ ÐÑÑÐÐÐ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>ÐÐÑÑÐÐÑ ÐÑÐ ÑÑÐÐÐÐÐÐÐ ÐÐ ÐÐÐÐ ÐÐÐÐÐÐÑÐÐÑÑ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_de.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -777,7 +777,7 @@
         <translation>Nachrichten: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Nachrichten: %1</translation>
     </message>
@@ -800,27 +800,27 @@
         <translation type="obsolete">Stop</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Ãber</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>Beenden</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreitengraph</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Nachrichtenprotokoll</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Hilfe</translation>
     </message>
@@ -830,57 +830,57 @@
         <translation type="obsolete">Strg+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Strg+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Strg+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Strg+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Strg+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>Datei</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>Ansicht</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Vidalia Hilfe</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Fehler beim Starten von Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Fehler bei der Verbindung zu Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Fehler beim Stoppen von Tor</translation>
     </message>
@@ -890,12 +890,12 @@
         <translation type="obsolete">Tor angehalten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor beendet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia konnte Tor nicht anhalten.</translation>
     </message>
@@ -905,12 +905,12 @@
         <translation type="obsolete">Tor startet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor lÃuft</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>Server ist eingeschalten</translation>
     </message>
@@ -920,22 +920,22 @@
         <translation type="obsolete">Tor stoppt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Strg+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Fehler beim Anwenden der Servereinstellungen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -954,157 +954,178 @@
 ÃberprÃfen Sie das Nachrichtenprotokoll auf weitere Informationen.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Netzwerk-Karte</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>Einstellungen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Neue IdentitÃt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Strg+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>Konnte keine neue IdentitÃt erstellen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation>Tor starten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation>Tor lÃuft nicht</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation>Tor wird beendet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation>Tor anhalten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation>Tor startet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation>Vidalia Kontroll-Panel</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation>Tor Status</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation>Vidalia Tastenkombinationen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation>Weiterleitung einrichten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <source>Set up a Tor relay and help the network grow</source>
         <translation>Richten Sie eine Tor-Weiterleitung ein und helfen Sie
 dem Netzwerk zu wachsen.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="182"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation>Netzwerk betrachten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation>Die Tor-Netzwerkkarte betrachten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation>Eine neue IdentitÃt verwenden</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation>SpÃtere Verbindungen als neu erscheinen lassen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation>Tors Bandbreitennutzung anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation>Tors Nachrichtenprotokollverlauf anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation>Hilfe anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation>Tor und Vidalia einrichten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation>Version und Lizenzinformationen anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation>Vidalia beenden</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation>Dieses Fenster beim Start anzeigen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation>Verstecken</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation>Dieses Fenster verstecken</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_en.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -774,7 +774,7 @@
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation type="unfinished"></translation>
     </message>
@@ -782,284 +782,305 @@
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_es.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -33,22 +33,22 @@
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="443"/>
         <source>Qt Version</source>
-        <translation>Versi&oacute;n de Qt</translation>
+        <translation>Versin de Qt</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="528"/>
         <source>Tor Version</source>
-        <translation>Versi&oacute;n de Tor</translation>
+        <translation>Versin de Tor</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="359"/>
         <source>Vidalia Version</source>
-        <translation>Versi&oacute;n de Vidalia</translation>
+        <translation>Versin de Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.cpp" line="79"/>
         <source>&lt;Not Running&gt;</source>
-        <translation>&lt;No est&aacute; ejecut&aacute;ndose&gt;</translation>
+        <translation>&lt;No est ejecutndose&gt;</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.cpp" line="75"/>
@@ -71,12 +71,12 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="625"/>
         <source>Start Tor with the specified configuration file (torrc)</source>
-        <translation>Iniciar Tor con el archivo de configuraci&oacute;n especificado (torrc)</translation>
+        <translation>Iniciar Tor con el archivo de configuracin especificado (torrc)</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="644"/>
         <source>Select path to Tor configuration file</source>
-        <translation>Seleccione el ruta del archivo de configuraci&oacute;n de Tor</translation>
+        <translation>Seleccione el ruta del archivo de configuracin de Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="647"/>
@@ -96,7 +96,7 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="702"/>
         <source>Vidalia will run with this User&apos;s permissions</source>
-        <translation>Vidalia se ejecutar&aacute; con los permisos de este Usuario</translation>
+        <translation>Vidalia se ejecutar con los permisos de este Usuario</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="722"/>
@@ -106,12 +106,12 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="729"/>
         <source>Vidalia will run with this Group&apos;s permissions</source>
-        <translation>Vidalia se ejecutar&aacute; con los permisos de este Grupo</translation>
+        <translation>Vidalia se ejecutar con los permisos de este Grupo</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="119"/>
         <source>Select Tor Configuration File</source>
-        <translation>Seleccione el Archivo de Configuraci&oacute;n de Tor</translation>
+        <translation>Seleccione el Archivo de Configuracin de Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="132"/>
@@ -141,7 +141,7 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="768"/>
         <source>Enable this if you wish to run Tor as a Windows service</source>
-        <translation>Habilitar &eacute;sto si usted desea que Tor se ejecute como un servicio de Windows.</translation>
+        <translation>Habilitar sto si usted desea que Tor se ejecute como un servicio de Windows.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="771"/>
@@ -175,7 +175,7 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="604"/>
         <source>Tor Configuration File</source>
-        <translation>Archivo de Configuraci&oacute;n de Tor</translation>
+        <translation>Archivo de Configuracin de Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="573"/>
@@ -185,12 +185,12 @@
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="80"/>
         <source>&apos;%1&apos; is not a valid IP address.</source>
-        <translation>&apos;%1&apos; no es una direcci&oacute;n IP v&aacute;lida.</translation>
+        <translation>&apos;%1&apos; no es una direccin IP vlida.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="542"/>
         <source>IP address on which Tor is listening for controller connections.</source>
-        <translation>Direcci&oacute;n IP que Tor usa para escuchar las conexiones de control</translation>
+        <translation>Direccin IP que Tor usa para escuchar las conexiones de control</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="549"/>
@@ -213,7 +213,7 @@
     <message>
         <location filename="../gui/config/appearancepage.ui" line="354"/>
         <source>Changes to language will only take effect after restarting Vidalia!</source>
-        <translation>Los cambios de lenguaje solo surtir&aacute;n efecto despu&eacute;s de reiniciar Vidalia!</translation>
+        <translation>Los cambios de lenguaje solo surtirn efecto despus de reiniciar Vidalia!</translation>
     </message>
     <message>
         <location filename="../gui/config/appearancepage.ui" line="370"/>
@@ -319,7 +319,7 @@
     <message>
         <location filename="../control/circuit.cpp" line="112"/>
         <source>Failed</source>
-        <translation>Fall&oacute;</translation>
+        <translation>Fall</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="113"/>
@@ -337,7 +337,7 @@
     <message>
         <location filename="../gui/network/circuititem.cpp" line="48"/>
         <source>&lt;Path Empty&gt;</source>
-        <translation>&lt;Ruta Vac&iacute;a&gt;</translation>
+        <translation>&lt;Ruta Vaca&gt;</translation>
     </message>
 </context>
 <context>
@@ -345,7 +345,7 @@
     <message>
         <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
         <source>Connection</source>
-        <translation>Conexi&oacute;n</translation>
+        <translation>Conexin</translation>
     </message>
     <message>
         <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
@@ -403,7 +403,7 @@
     <message>
         <location filename="../gui/config/configdialog.cpp" line="154"/>
         <source>Error Saving Configuration</source>
-        <translation>Error al Guardar Configuraci&oacute;n</translation>
+        <translation>Error al Guardar Configuracin</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="74"/>
@@ -421,12 +421,12 @@
     <message>
         <location filename="../control/controlconnection.cpp" line="294"/>
         <source>Control socket is not connected.</source>
-        <translation>Conector de Control no est&aacute; conectado.</translation>
+        <translation>Conector de Control no est conectado.</translation>
     </message>
     <message>
         <location filename="../control/controlconnection.cpp" line="239"/>
         <source>Control socket is not connected</source>
-        <translation>Conector de Control no est&aacute; conectado.</translation>
+        <translation>Conector de Control no est conectado.</translation>
     </message>
 </context>
 <context>
@@ -439,7 +439,7 @@
     <message>
         <location filename="../control/controlsocket.cpp" line="101"/>
         <source>Error disconnecting socket. [%1]</source>
-        <translation>Error desconectando conexi&oacute;n. [%1]</translation>
+        <translation>Error desconectando conexin. [%1]</translation>
     </message>
     <message>
         <location filename="../control/controlsocket.cpp" line="159"/>
@@ -449,28 +449,28 @@
     <message>
         <location filename="../control/controlsocket.cpp" line="196"/>
         <source>Socket disconnected while attempting to read a line of data.</source>
-        <translation>Conexi&oacute;n desconectada mientras se trataba de leer una l&iacute;nea de informaci&oacute;n.</translation>
+        <translation>Conexin desconectada mientras se trataba de leer una lnea de informacin.</translation>
     </message>
     <message>
         <location filename="../control/controlsocket.cpp" line="234"/>
         <source>Invalid control reply. [%1]</source>
-        <translation>Respuesta de control inv&aacute;lida. [%1]</translation>
+        <translation>Respuesta de control invlida. [%1]</translation>
     </message>
     <message>
         <location filename="../control/controlsocket.cpp" line="150"/>
         <source>Control socket is not connected.</source>
-        <translation>Conexi&oacute;n de control no esta conectada.</translation>
+        <translation>Conexin de control no esta conectada.</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 no pudo determinar la versi&oacute;n del protocolo usado por Tor. Verifica que el n&uacute;mero de puerto de control est&aacute; indicado correctaamente y que est&aacute;s usando una versi&oacute;n reciente de Tor.</translation>
+        <translation>Vidalia no pudo determinar la versin del protocolo usado por Tor. Verifica que el nmero de puerto de control est indicado correctaamente y que ests usando una versin reciente de Tor.</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 s&oacute;lo soporta la versi&oacute;n 1 del protocolo Tor (Versi&oacute;n %1 detectada)</translation>
+        <translation>Vidalia slo soporta la versin 1 del protocolo Tor (Versin %1 detectada)</translation>
     </message>
 </context>
 <context>
@@ -493,7 +493,7 @@
     <message>
         <location filename="../gui/config/generalpage.ui" line="375"/>
         <source>Startup Options</source>
-        <translation>Opciones de inicio de sesi&oacute;n</translation>
+        <translation>Opciones de inicio de sesin</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="390"/>
@@ -776,7 +776,7 @@
         <translation>Mensajes Mostrados: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Mensajes Mostrados: %1</translation>
     </message>
@@ -799,27 +799,27 @@
         <translation type="obsolete">Detener</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Acerca de</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>Salir</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>GrÃfica de Ancho de Banda</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Informe de Mensajes</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Ayuda</translation>
     </message>
@@ -829,57 +829,57 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>Archivo</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>Ver</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Ayuda de Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Error al Iniciar Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Error Conectando a Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Error Deteniendo Tor</translation>
     </message>
@@ -889,12 +889,12 @@
         <translation type="obsolete">Tor esta detenido</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor ha Salido</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia no pudo detener Tor.</translation>
     </message>
@@ -904,12 +904,12 @@
         <translation type="obsolete">Tor esta iniciando</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation type="unfinished">Tor esta ejecutandose</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>Servidor esta Habilitado</translation>
     </message>
@@ -919,22 +919,22 @@
         <translation type="obsolete">Tor esta deteniendose</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Error Aplicando Preferencias del Servidor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -952,155 +952,176 @@
 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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Mapa de Red</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>Preferencias</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Nueva Identidad</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>FallÃ en Crear Nueva Identidad</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_fa.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -774,7 +774,7 @@
         <translation>ÙÛØÙâÙØÛ ÙÙØÛØâØØØÙ ØØÙ:â</translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>ÙÛØÙâÙØÛ ÙÙØÛØâØØØÙ ØØÙ: %1â</translation>
     </message>
@@ -792,27 +792,27 @@
         <translation type="obsolete">ØÙÙÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>ØØØØØÙâÛ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>ØØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>ÙÙÙØØØ ÙÙÙØÛâØØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>ÚØØØØ ÙÛØÙâÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>ØØÙÙÙØ</translation>
     </message>
@@ -822,136 +822,136 @@
         <translation type="obsolete">ÚÙØØÙ + S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>ÚÙØØÙ + T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>ÚÙØØÙ + B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>ÚÙØØÙ + L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>ÚÙØØÙ + ?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>ÙØÛÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>ÙÙØÛØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>ØØÙÙÙØÛ ÙÛØØÙÛØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>ØØØ ØØ ØØÙâØÙØØØÛ ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>ØØØ ØØ ØØØØÙ ØÙ ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>ØØØ ØØ ØÙÙÙ ØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>ØÙØ ØØØÙÙ ÙÛØØ ÚØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>ÙÛØØÙÛØ ÙØÙØÙØØ ØÙØ ØØ ÙØÙÙÙ ÚÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>ØØÙØ ÙØØÙ ØØÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>ÚÙØØÙ + N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>ØØÙØÙ ØÙØÛÙØØ ØØÙØ ØØ ØØØ ÙÙØØÙ ØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>ÙÛØØÙÛØ ÙØÙØÙØØ ØÙØÛÙØØ ØÙØ ØØØÛ ØØÙØ ØØ ØØÙØÙ ÚÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>ÙÙØÙâÛ ØØÚÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>ØÙØÛÙØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>ÙÙÛØ ØØÛØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>ÚÙØØÙ + I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>ØÙØÙ ØØØØÙØØ ØØØÛ ØÙ ØÙØØ ÙØÙØÙØ ØØ ØØØØÙØØ ÙØÙÛ ÙÙØÛØ ØØØÙ ØÙØÙÙØ ØØ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>ØÛØØØ ÙÙÛØ ØØÛØ ØÙ ØÚØØ ØÙØØÙÛØ</translation>
     </message>
@@ -976,125 +976,146 @@
         <translation type="obsolete">ØÙØ ÙØÙÙÙ ØØÙ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>ØÙØ ØØ ØØÙ ØØØØ ØØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_fi.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -777,7 +777,7 @@
         <translation>Tapahtumia nÃkyvillÃ: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Tapahtumia nÃkyvillÃ: %1</translation>
     </message>
@@ -800,27 +800,27 @@
         <translation type="obsolete">PysÃytÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Tietoa Vidaliasta</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>Lopeta</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>YhteydenkÃyttÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Tapahtumaloki</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Ohje</translation>
     </message>
@@ -830,57 +830,57 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>Tiedosto</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>NÃytÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Vidalian ohje</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Virhe Tor-ohjelman kÃynnistymisessÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Virhe yhdistettÃessÃ Tor-ohjelmaan</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Virhe Tor-ohjelman pysÃhtymisessÃ</translation>
     </message>
@@ -890,12 +890,12 @@
         <translation type="obsolete">Tor on pysÃhtynyt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor yllÃttÃen pysÃhtyi</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia ei onnistunut pysÃyttÃmÃÃn Tor-ohjelmaa</translation>
     </message>
@@ -905,12 +905,12 @@
         <translation type="obsolete">Tor kÃynnistyy</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor on pÃÃllÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>Palvelin on kÃytÃssÃ</translation>
     </message>
@@ -920,22 +920,22 @@
         <translation type="obsolete">PysÃytetÃÃn Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Virhe palvelinasetusten kÃyttÃÃnottamisessa</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,155 +953,176 @@
 Ole hyvÃ ja tarkista tapahtumalokista mitÃ tapahtui Tor-ohjelmalle ennen pysÃhtymistÃ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Verkkokartta</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>Asetukset</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Uusi henkilÃllisyys</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>Uuden henkilÃllisyyden luominen epÃonnistui</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation>KÃynnistÃ Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation>Tor ei ole kÃynnissÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation>Tor-ohjelmaa sammutetaan</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation>PysÃytÃ Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation>Tor kÃynnistyy</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation>Vidalian ohjauspaneeli</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation>Tor-ohjelman tila</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation>Vidalian pikatoiminnot</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation>VÃlityksen asetukset</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <source>Set up a Tor relay and help the network grow</source>
         <translation>Tee Tor vÃlityspalvelin ja auta verkkoa kasvamaan</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="182"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation>NÃytÃ verkko</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation>NÃytÃ Tor-verkkokartta</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation>KÃytÃ uutta henkilÃllisyyttÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation>Tee tulevista yhteyksistÃ uusia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation>NÃytÃ Tor-ohjelman yhteydenkÃyttÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation>NÃytÃ Tor-ohjelman tapahtumalokin historia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation>NÃytÃ Ohjeet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation>Tor-ohjelman ja Vidalian asetukset</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation>NÃytÃ versio- ja lisenssitiedot</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation>Lopeta Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation>NÃytÃ tÃmÃ ikkuna kÃynnistettÃessÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation>Piilota</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation>Piilota tÃmÃ ikkuna</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_fr.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -777,7 +777,7 @@
         <translation>Messages montrÃs : </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Messages montrÃs : %1</translation>
     </message>
@@ -800,27 +800,27 @@
         <translation type="obsolete">ArrÃter</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Ã propos</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>Quitter</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>Graphe bande passante</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Journal des messages</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Aide</translation>
     </message>
@@ -830,57 +830,57 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>Fichier</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>AperÃu</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Aide de Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Erreur de dÃmarrage Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Erreur de connexion Ã Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Erreur d&apos;arrÃt Tor</translation>
     </message>
@@ -890,12 +890,12 @@
         <translation type="obsolete">Tor est arrÃtÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor a ÃtÃ quittÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia n&apos;a pas pu arrÃter Tor.</translation>
     </message>
@@ -905,12 +905,12 @@
         <translation type="obsolete">Tor est en cours de dÃmarrage</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor est actif</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>Le serveur est activÃ</translation>
     </message>
@@ -920,22 +920,22 @@
         <translation type="obsolete">Tor est en cours d&apos;arrÃt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Erreur en appliquant les options du serveur</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,155 +953,176 @@
 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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>ParamÃtres</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Voir rÃseau Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Nouvelle identitÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation>DÃmarrer Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation>Tor n&apos;est pas en fonctionnement</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation>Tor est en cours d&apos;arrÃt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation>ArrÃter Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation>Tor est en cours de dÃmarrage</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation>Panneau de contrÃle de Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation>Ãtat du service Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation>Raccourcis Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation>Installer un relais</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <source>Set up a Tor relay and help the network grow</source>
         <translation>Configurer un relais Tor, contribuant Ã la croissance du rÃseau</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="182"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation>Voir le rÃseau</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation>Voir la carte du rÃseau Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation>Utiliser une nouvelle identitÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation>Faire que les connexions suivantes apparaissent comme de nouvelles connexions</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation>Voir l&apos;utilisation de bande passante de Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation>Voir l&apos;historique du journal des messages de Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation>Voir la documentation d&apos;aide</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation>Configurer Tor et Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation>Voir les informations de version et de licence</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation>Quitter Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation>Afficher cette fenÃtre au dÃmarrage</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation>Cacher</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation>Cacher cette fenÃtre</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_hu.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -777,7 +777,7 @@
         <translation>Megmutatott Ãzenetek: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Megmutatott Ãzenetek: %1</translation>
     </message>
@@ -800,27 +800,27 @@
         <translation type="obsolete">LeÃllÃtÃs</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>NÃvjegy</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>KilÃpÃs</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>SÃvszÃlessÃg grafikon</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Log Ãzenetek</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>SÃgÃ</translation>
     </message>
@@ -830,57 +830,57 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>FÃjl</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>NÃzet</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Vidalia sÃgÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Hiba a Tor indÃtÃsÃval</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Hiba a Tor-hoz kapcsolÃdÃssal</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Hiba a Tor leÃllÃtÃsÃval</translation>
     </message>
@@ -890,12 +890,12 @@
         <translation type="obsolete">A Tor leÃllt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>A Tor bezÃrÃdott</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>A Vidalia nem tudta leÃllÃtani a Tor-t.</translation>
     </message>
@@ -905,12 +905,12 @@
         <translation type="obsolete">A Tor elindul</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation type="unfinished">A Tor fut</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>A szerver bekapcsolva</translation>
     </message>
@@ -920,23 +920,23 @@
         <translation type="obsolete">A Tor leÃll</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <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="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -958,158 +958,179 @@
 esemÃnyekre utalÃ jeleket keresve.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation type="unfinished">BeÃllÃtÃsok</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation type="unfinished">Ãj identitÃs</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_it.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -776,7 +776,7 @@
         <translation>Messaggi visualizzati: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Messaggi visualizzati: %1</translation>
     </message>
@@ -799,27 +799,27 @@
         <translation type="obsolete">Ferma</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Informazioni su</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>Esci</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>Grafico dell&apos;ampiezza di banda</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Log dei messaggi</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Aiuto</translation>
     </message>
@@ -829,57 +829,57 @@
         <translation type="obsolete">Strl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>File</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>Mostra</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Aiuto di Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Errore nell&apos;avvio di Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Errore nella connessione a Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Errore nell&apos;arresto di Tor</translation>
     </message>
@@ -889,12 +889,12 @@
         <translation type="obsolete">Tor Ã arrestato</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor Ã chiuso</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia non Ã riuscito a fermare Tor.</translation>
     </message>
@@ -904,12 +904,12 @@
         <translation type="obsolete">Avvio di Tor in corso</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation type="unfinished">Tor Ã avviato</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>Il server Ã abilitato</translation>
     </message>
@@ -919,22 +919,22 @@
         <translation type="obsolete">Arresto di Tor in corso</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Errore nell&apos;applicazione delle impostazioni del server</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -952,155 +952,176 @@
 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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>Impostazioni</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Mappa della Rete</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Nuova identitÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>Impossibile creare una nuova identitÃ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_nb.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -1,1724 +1,2143 @@
-<!DOCTYPE TS>
-<TS>
-  <context>
-    <name></name>
-    <message>
-      <source>Arial</source>
-      <translation>Arial</translation>
-    </message>
-  </context>
-  <context>
-    <name>AboutDialog</name>
-    <message>
-      <source>About Vidalia</source>
-      <translation>Om Vidalia </translation>
-    </message>
-    <message>
-      <source>Vidalia</source>
-      <translation>Vidalia</translation>
-    </message>
-    <message>
-      <source>Tor</source>
-      <translation>Tor</translation>
-    </message>
-    <message>
-      <source>Qt</source>
-      <translation>Qt</translation>
-    </message>
-    <message>
-      <source>Qt Version</source>
-      <translation>Qt Versjon </translation>
-    </message>
-    <message>
-      <source>Tor Version</source>
-      <translation>Tor Versjon</translation>
-    </message>
-    <message>
-      <source>Vidalia Version</source>
-      <translation>Vidalia Versjon</translation>
-    </message>
-    <message>
-      <source>&lt;Not Running></source>
-      <translation>&lt;KjÃrer ikke></translation>
-    </message>
-    <message>
-      <source>&lt;Unavailable></source>
-      <translation>&lt;Utilgjengelig></translation>
-    </message>
-  </context>
-  <context>
-    <name>AdvancedPage</name>
-    <message>
-      <source>Control Port</source>
-      <translation>Kontroll Port</translation>
-    </message>
-    <message>
-      <source>9051</source>
-      <translation>9051</translation>
-    </message>
-    <message>
-      <source>Start Tor with the specified configuration file (torrc)</source>
-      <translation>Start Tor med den spesifiserte konfigurasjonsfilen (torrc)</translation>
-    </message>
-    <message>
-      <source>Select path to Tor configuration file</source>
-      <translation>Filsti til Tor sin konfigurasjonsfil</translation>
-    </message>
-    <message>
-      <source>Browse</source>
-      <translation>Bla</translation>
-    </message>
-    <message>
-      <source>Permissions</source>
-      <translation>Tillatelser</translation>
-    </message>
-    <message>
-      <source>Run as User:</source>
-      <translation>KjÃr som Bruker:</translation>
-    </message>
-    <message>
-      <source>Vidalia will run with this User's permissions</source>
-      <translation>Vidalia vil kjÃre med denne brukerens tillatelser</translation>
-    </message>
-    <message>
-      <source>Run as Group:</source>
-      <translation>KjÃr under Gruppe:</translation>
-    </message>
-    <message>
-      <source>Vidalia will run with this Group's permissions</source>
-      <translation>Vidalia vil kjÃre med denne Gruppen's tillatelser</translation>
-    </message>
-    <message>
-      <source>Select Tor Configuration File</source>
-      <translation>Velg Konfigurasjonsfil for Tor</translation>
-    </message>
-    <message>
-      <source>File Not Found</source>
-      <translation>Finner Ikke Filen</translation>
-    </message>
-    <message>
-      <source>%1 does not exist. Would you like to create it?</source>
-      <translation>%1 finnes ikke. Vil du lage den?</translation>
-    </message>
-    <message>
-      <source>Failed to Create File</source>
-      <translation>Klarte ikke Lage FIl</translation>
-    </message>
-    <message>
-      <source>Unable to create %1 [%2]</source>
-      <translation>Kunne ikke opprette %1 [%2]</translation>
-    </message>
-    <message>
-      <source>Service</source>
-      <translation>Tjeneste</translation>
-    </message>
-    <message>
-      <source>Enable this if you wish to run Tor as a Windows service</source>
-      <translation>Skru dette pÃ om du vil kjÃre Tor som en WIndows-tjeneste</translation>
-    </message>
-    <message>
-      <source>Run Tor in the background as a Windows service</source>
-      <translation>KjÃr Tor i bakgrunnen som en Windows-tjeneste</translation>
-    </message>
-    <message>
-      <source>Unable to remove Tor Service</source>
-      <translation>Kunne ikke fjerne Tor-tjenesten</translation>
-    </message>
-    <message>
-      <source>Unable to install Tor Service</source>
-      <translation>Kunne ikke installere Tor-tjenesten</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to install the Tor service.</source>
-      <translation>Vidalia klarte ikke installere Tor-tjenesten</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to remove the Tor service.
-
-You may need to remove it manually.</source>
-      <translation>Vidalia klarte ikke installere Tor-tjenesten 
-
-Du mÃ kanskje fjerne den manuellt.</translation>
-    </message>
-    <message>
-      <source>Tor Configuration File</source>
-      <translation>Tors Konfigurasjonsfil</translation>
-    </message>
-    <message>
-      <source>Port that Vidalia uses to communicate with Tor.</source>
-      <translation>Porten som Vidalia bruker til Ã kommunisere med Tor.</translation>
-    </message>
-    <message>
-      <source>'%1' is not a valid IP address.</source>
-      <translation>'%1' er ikke en gyldig IP adresse.</translation>
-    </message>
-    <message>
-      <source>IP address on which Tor is listening for controller connections.</source>
-      <translation>IP adresse som Tor lytter etter kontroller-forbindelser pÃ.</translation>
-    </message>
-    <message>
-      <source>:</source>
-      <translation>:</translation>
-    </message>
-  </context>
-  <context>
-    <name>AppearancePage</name>
-    <message>
-      <source>Language</source>
-      <translation>SprÃk</translation>
-    </message>
-    <message>
-      <source>Choose the language used in Vidalia</source>
-      <translation>Velg sprÃket du vil Vidalia skal bruke</translation>
-    </message>
-    <message>
-      <source>Changes to language will only take effect after restarting Vidalia!</source>
-      <translation>Endringer av valgt sprÃk trer fÃrst i kraft etter du starter Vidalia pÃ ny!</translation>
-    </message>
-    <message>
-      <source>Style</source>
-      <translation>Stil</translation>
-    </message>
-    <message>
-      <source>Choose Vidalia's interface style</source>
-      <translation>Velg stil for Vidalia's grensesnitt</translation>
-    </message>
-  </context>
-  <context>
-    <name>BandwidthGraph</name>
-    <message>
-      <source>Tor Bandwidth Usage</source>
-      <translation>Tors BÃndbredde-Bruk</translation>
-    </message>
-    <message>
-      <source>Show Settings</source>
-      <translation>Vis Innstillinger</translation>
-    </message>
-    <message>
-      <source>Reset</source>
-      <translation>Nullstill</translation>
-    </message>
-    <message>
-      <source>Receive Rate</source>
-      <translation>InngÃende Hastighet</translation>
-    </message>
-    <message>
-      <source>Send Rate</source>
-      <translation>UtgÃende Hastighet</translation>
-    </message>
-    <message>
-      <source>Changes the transparency of the Bandwidth Graph</source>
-      <translation>Endringer gjennomsiktigheten av BÃndbredde-Grafen</translation>
-    </message>
-    <message>
-      <source>Save</source>
-      <translation>Lagr</translation>
-    </message>
-    <message>
-      <source>Cancel</source>
-      <translation>Avbryt</translation>
-    </message>
-    <message>
-      <source>Since:</source>
-      <translation>Siden:</translation>
-    </message>
-    <message>
-      <source>100</source>
-      <translation>100</translation>
-    </message>
-    <message>
-      <source>% Opaque</source>
-      <translation>% Ugjennomsiktig</translation>
-    </message>
-    <message>
-      <source>Hide Settings</source>
-      <translation>Skjul Innstillinger</translation>
-    </message>
-    <message>
-      <source>Always on Top</source>
-      <translation>Alltid Ãverst</translation>
-    </message>
-    <message>
-      <source>Style</source>
-      <translation>Stil</translation>
-    </message>
-  </context>
-  <context>
-    <name>Circuit</name>
-    <message>
-      <source>New</source>
-      <translation>Ny</translation>
-    </message>
-    <message>
-      <source>Open</source>
-      <translation>Ãpen</translation>
-    </message>
-    <message>
-      <source>Building</source>
-      <translation>Bygger</translation>
-    </message>
-    <message>
-      <source>Failed</source>
-      <translation>Feilet</translation>
-    </message>
-    <message>
-      <source>Closed</source>
-      <translation>Lukket</translation>
-    </message>
-    <message>
-      <source>Unknown</source>
-      <translation>Ukjent</translation>
-    </message>
-  </context>
-  <context>
-    <name>CircuitItem</name>
-    <message>
-      <source>&lt;Path Empty></source>
-      <translation>&lt;Tom Sti></translation>
-    </message>
-  </context>
-  <context>
-    <name>CircuitListWidget</name>
-    <message>
-      <source>Connection</source>
-      <translation>Forbindelse</translation>
-    </message>
-    <message>
-      <source>Status</source>
-      <translation>Status</translation>
-    </message>
-    <message>
-      <source>Close Circuit</source>
-      <translation>Lukk Krets</translation>
-    </message>
-    <message>
-      <source>Close Stream</source>
-      <translation>Lukk StrÃm</translation>
-    </message>
-    <message>
-      <source>Zoom to Circuit</source>
-      <translation>Zoom til Krets</translation>
-    </message>
-  </context>
-  <context>
-    <name>ConfigDialog</name>
-    <message>
-      <source>General</source>
-      <translation>Generell</translation>
-    </message>
-    <message>
-      <source>Server</source>
-      <translation>Tjener</translation>
-    </message>
-    <message>
-      <source>Advanced</source>
-      <translation>Avansert</translation>
-    </message>
-    <message>
-      <source>Cancel</source>
-      <translation>Avbryt</translation>
-    </message>
-    <message>
-      <source>Appearance</source>
-      <translation>Utseende</translation>
-    </message>
-    <message>
-      <source>Save</source>
-      <translation>Lagr</translation>
-    </message>
-    <message>
-      <source>Error Saving Configuration</source>
-      <translation>Feil ved Lagring av Konfigurasjon</translation>
-    </message>
-    <message>
-      <source>Help</source>
-      <translation>Hjelp</translation>
-    </message>
-    <message>
-      <source>Settings</source>
-      <translation>Innstillinger</translation>
-    </message>
-  </context>
-  <context>
-    <name>ControlConnection</name>
-    <message>
-      <source>Control socket is not connected.</source>
-      <translation>Kontroll-porten er ikke tilkoblet.</translation>
-    </message>
-    <message>
-      <source>Control socket is not connected</source>
-      <translation>Kontroll-porten er ikke tilkoblet.</translation>
-    </message>
-  </context>
-  <context>
-    <name>ControlSocket</name>
-    <message>
-      <source>Error connecting to %1:%2 [%3]</source>
-      <translation>Feil ved tilkobling til %1:%2 [%3]</translation>
-    </message>
-    <message>
-      <source>Error disconnecting socket. [%1]</source>
-      <translation>Feil ved frakobling av forbindelse [%1]</translation>
-    </message>
-    <message>
-      <source>Error sending control command. [%1]</source>
-      <translation>Feil ved sending av kontroll-kommando. [%1]</translation>
-    </message>
-    <message>
-      <source>Socket disconnected while attempting to read a line of data.</source>
-      <translation>Forbindelsen ble avbrutt under forsÃk pÃ Ã lese en linje med data.</translation>
-    </message>
-    <message>
-      <source>Invalid control reply. [%1]</source>
-      <translation>Ugyldig kontroll-svar: [%1]</translation>
-    </message>
-    <message>
-      <source>Control socket is not connected.</source>
-      <translation>Kontroll-porten er ikke tilkoblet.</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to determine Tor's control protocol version. Verify that your control port number is set correctly and you are running a recent version of Tor.</source>
-      <translation>Vidalia klarte ikke Ã fastslÃ Tors kontroll-protokoll versjon. Verifiser at du har angitt riktig kontroll-port og at du bruker en nyere utgave av Tor.</translation>
-    </message>
-    <message>
-      <source>Vidalia only supports Version 1 of Tor's control protocol (version %1 detected).
-Upgrade to a newer version of Tor.</source>
-      <translation>Vidalia stÃtter kun Versjon 1 av Tor's kontrollprotokoll (versjon %1 detektert). 
-Oppgrader til en nyere utgave av Tor.</translation>
-    </message>
-  </context>
-  <context>
-    <name>GeneralPage</name>
-    <message>
-      <source>Path to Tor's executable</source>
-      <translation>Sti til Tor's kjÃrbare programfil</translation>
-    </message>
-    <message>
-      <source>Select path to Tor executable</source>
-      <translation>Velg filsti til Tor's programfil</translation>
-    </message>
-    <message>
-      <source>Browse</source>
-      <translation>Bla</translation>
-    </message>
-    <message>
-      <source>Startup Options</source>
-      <translation>Oppstartsvalg</translation>
-    </message>
-    <message>
-      <source>Select to start Vidalia on system boot</source>
-      <translation>Velg for Ã starte Vidalia ved systemoppstart</translation>
-    </message>
-    <message>
-      <source>Run Vidalia on system startup</source>
-      <translation>KjÃr Vidalia ved system-oppstart</translation>
-    </message>
-    <message>
-      <source>Set to start Tor when you launch Vidalia</source>
-      <translation>Skru pÃ for Ã starte Tor nÃr du starter Vidalia</translation>
-    </message>
-    <message>
-      <source>Start Tor when Vidalia starts</source>
-      <translation>Start Tor nÃr Vidalia starter</translation>
-    </message>
-    <message>
-      <source>Select Path to Tor</source>
-      <translation>Velg filsti til Tor</translation>
-    </message>
-    <message>
-      <source>Tor Executable</source>
-      <translation>Tor Programfilen</translation>
-    </message>
-    <message>
-      <source>Executables (*.exe)</source>
-      <translation>KjÃrbare (*.exe)</translation>
-    </message>
-  </context>
-  <context>
-    <name>GraphFrame</name>
-    <message>
-      <source>Recv: </source>
-      <translation>Mottat:</translation>
-    </message>
-    <message>
-      <source>Sent: </source>
-      <translation>Sendt:</translation>
-    </message>
-    <message>
-      <source>%1 KB</source>
-      <translation>%1 KB</translation>
-    </message>
-    <message>
-      <source>%1 MB</source>
-      <translation>%1 MB</translation>
-    </message>
-    <message>
-      <source>%1 GB</source>
-      <translation>%1 GB</translation>
-    </message>
-    <message>
-      <source>%1 KB/s</source>
-      <translation>%1 KB/s</translation>
-    </message>
-  </context>
-  <context>
-    <name>HelpBrowser</name>
-    <message>
-      <source>Vidalia Help</source>
-      <translation>Vidalia Hjelp</translation>
-    </message>
-    <message>
-      <source>Find Previous</source>
-      <translation>Finn Forrige</translation>
-    </message>
-    <message>
-      <source>Find Next</source>
-      <translation>Finn Neste</translation>
-    </message>
-    <message>
-      <source>Case sensitive</source>
-      <translation>Skill mellom store og smÃ bokstaver</translation>
-    </message>
-    <message>
-      <source>Contents</source>
-      <translation>Innhold</translation>
-    </message>
-    <message>
-      <source>Help Topics</source>
-      <translation>Hjelpe-emner</translation>
-    </message>
-    <message>
-      <source>Search</source>
-      <translation>SÃk</translation>
-    </message>
-    <message>
-      <source>Found Documents</source>
-      <translation>Dokumenter Funnet </translation>
-    </message>
-    <message>
-      <source>Back</source>
-      <translation>Tilbake</translation>
-    </message>
-    <message>
-      <source>Move to previous page (Backspace)</source>
-      <translation>GÃ til forrige side (Rettetast)</translation>
-    </message>
-    <message>
-      <source>Backspace</source>
-      <translation>Backspace</translation>
-    </message>
-    <message>
-      <source>Forward</source>
-      <translation>Fremover</translation>
-    </message>
-    <message>
-      <source>Move to next page (Shift+Backspace)</source>
-      <translation>GÃ til neste side (Shift+Backspace)</translation>
-    </message>
-    <message>
-      <source>Shift+Backspace</source>
-      <translation>operasjon</translation>
-    </message>
-    <message>
-      <source>Home</source>
-      <translation>Hjem</translation>
-    </message>
-    <message>
-      <source>Move to the Home page (Ctrl+H)</source>
-      <translation>Flytt til Hjem-siden (Ctrl+H)</translation>
-    </message>
-    <message>
-      <source>Ctrl+H</source>
-      <translation>Ctrl+H</translation>
-    </message>
-    <message>
-      <source>Find</source>
-      <translation>Finn</translation>
-    </message>
-    <message>
-      <source>Search for a word or phrase on current page (Ctrl+F)</source>
-      <translation>SÃk etter ord eller streng pÃ denne siden (Ctrl+F)</translation>
-    </message>
-    <message>
-      <source>Ctrl+F</source>
-      <translation>Ctrl+F</translation>
-    </message>
-    <message>
-      <source>Close</source>
-      <translation>Lukk</translation>
-    </message>
-    <message>
-      <source>Close Vidalia Help</source>
-      <translation>Lukk Vidalia Hjelp</translation>
-    </message>
-    <message>
-      <source>Esc</source>
-      <translation>Esc</translation>
-    </message>
-    <message>
-      <source>Error Loading Help Contents: </source>
-      <translation>Feil ved henging av Hjelp-Innhold </translation>
-    </message>
-    <message>
-      <source>Search reached end of document</source>
-      <translation>SÃket nÃdde slutten av dokumentet</translation>
-    </message>
-    <message>
-      <source>Search reached start of document</source>
-      <translation>SÃket nÃdde begynnelsen av dokumentet</translation>
-    </message>
-    <message>
-      <source>Text not found in document</source>
-      <translation>Fant ikke teksten i dokumentet</translation>
-    </message>
-    <message>
-      <source>Find:</source>
-      <translation>Finn:</translation>
-    </message>
-    <message>
-      <source>Whole words only</source>
-      <translation>Kun hele ord</translation>
-    </message>
-    <message>
-      <source>Searching for:</source>
-      <translation>SÃker etter:</translation>
-    </message>
-    <message>
-      <source>Supplied XML file is not a valid Contents document.</source>
-      <translation>Den oppgitte XML-filen er ikke ett dokument med gyldig innhold.</translation>
-    </message>
-    <message>
-      <source>Found %1 results</source>
-      <translation>Fant %1 resultater</translation>
-    </message>
-  </context>
-  <context>
-    <name>HelpTextBrowser</name>
-    <message>
-      <source>Error opening help file: </source>
-      <translation>Feil ved Ãpning av hjelpe-fil:</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogEvent</name>
-    <message>
-      <source>Debug</source>
-      <translation>Avlus</translation>
-    </message>
-    <message>
-      <source>Info</source>
-      <translation>Info</translation>
-    </message>
-    <message>
-      <source>Notice</source>
-      <translation>Merknad</translation>
-    </message>
-    <message>
-      <source>Warning</source>
-      <translation>Advarsel</translation>
-    </message>
-    <message>
-      <source>Error</source>
-      <translation>Feil</translation>
-    </message>
-    <message>
-      <source>Unknown</source>
-      <translation>Ukjent</translation>
-    </message>
-  </context>
-  <context>
-    <name>LogTreeWidget</name>
-    <message>
-      <source>Messages Shown: </source>
-      <translation>Meldinger Vist:</translation>
-    </message>
-    <message>
-      <source>Messages Shown: %1</source>
-      <translation>Meldinger Vist: %1</translation>
-    </message>
-  </context>
-  <context>
-    <name>MainWindow</name>
-    <message>
-      <source>About</source>
-      <translation>Om</translation>
-    </message>
-    <message>
-      <source>Exit</source>
-      <translation>Avslutt</translation>
-    </message>
-    <message>
-      <source>Bandwidth Graph</source>
-      <translation>BÃndbredde Graf</translation>
-    </message>
-    <message>
-      <source>Message Log</source>
-      <translation>Meldingslogg</translation>
-    </message>
-    <message>
-      <source>Help</source>
-      <translation>Hjelp</translation>
-    </message>
-    <message>
-      <source>Ctrl+T</source>
-      <translation>Ctrl+T</translation>
-    </message>
-    <message>
-      <source>Ctrl+B</source>
-      <translation>Ctrl+B</translation>
-    </message>
-    <message>
-      <source>Ctrl+L</source>
-      <translation>Ctrl+L</translation>
-    </message>
-    <message>
-      <source>Ctrl+?</source>
-      <translation>Ctrl+?</translation>
-    </message>
-    <message>
-      <source>File</source>
-      <translation>Fil</translation>
-    </message>
-    <message>
-      <source>Tor</source>
-      <translation>Tor </translation>
-    </message>
-    <message>
-      <source>View</source>
-      <translation>Vis</translation>
-    </message>
-    <message>
-      <source>Vidalia Help</source>
-      <translation>Vidalia Hjelp</translation>
-    </message>
-    <message>
-      <source>Error Starting Tor</source>
-      <translation>Feil ved oppstart av Tor</translation>
-    </message>
-    <message>
-      <source>Error Connecting to Tor</source>
-      <translation>Feil ved tilknytning til Tor</translation>
-    </message>
-    <message>
-      <source>Error Stopping Tor</source>
-      <translation>Feil ved Stopping av Tor</translation>
-    </message>
-    <message>
-      <source>Tor Exited</source>
-      <translation>Tor Avsluttet</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to stop Tor.</source>
-      <translation>Vidalia klarte ikke Ã avslutte Tor</translation>
-    </message>
-    <message>
-      <source>Tor is running</source>
-      <translation>Tor kjÃrer</translation>
-    </message>
-    <message>
-      <source>Server is Enabled</source>
-      <translation>Tjeneren er tilkoblet</translation>
-    </message>
-    <message>
-      <source>Ctrl+N</source>
-      <translation>Ctrl+N</translation>
-    </message>
-    <message>
-      <source>Error Applying Server Settings</source>
-      <translation>Feil ved pÃlegging av Tjener-Innstillinger</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to apply your server's settings.</source>
-      <translation>Vidalia kunne ikke iverksette dine tjener-innstillinger.</translation>
-    </message>
-    <message>
-      <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>Du kjÃrer allered en Tor-tjener. Hvis du avslutter din tjener vil det bryte dine Ãpne forbindelser fra klienter. 
-
-Vil du stenge ned gradvis og gi dine klienter tid til Ã finne en ny tjener?</translation>
-    </message>
-    <message>
-      <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 oppdaget at Tor plutselig og uventet avsluttet.
-
-Vennligst sjekk meldings-loggen for indikatorer pÃ hva som skjedde med Tor fÃr programmet avsluttet.</translation>
-    </message>
-    <message>
-      <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>
-      <source>Network Map</source>
-      <translation>Nettverkskart</translation>
-    </message>
-    <message>
-      <source>Settings</source>
-      <translation>Innstillinger</translation>
-    </message>
-    <message>
-      <source>New Identity</source>
-      <translation>Ny Identitet </translation>
-    </message>
-    <message>
-      <source>Ctrl+I</source>
-      <translation>Ctrl+I</translation>
-    </message>
-    <message>
-      <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>
-      <source>Failed to Create New Identity</source>
-      <translation>Kunne ikke lage Ny Identitet</translation>
-    </message>
-    <message>
-      <source>Start Tor</source>
-      <translation>Start Tor</translation>
-    </message>
-    <message>
-      <source>Tor is not running</source>
-      <translation>Tor kjÃrer ikke</translation>
-    </message>
-    <message>
-      <source>Tor is shutting down</source>
-      <translation>Tor stenger ned</translation>
-    </message>
-    <message>
-      <source>Stop Tor</source>
-      <translation>Stopp Tor</translation>
-    </message>
-    <message>
-      <source>Tor is starting up</source>
-      <translation>Tor starter opp</translation>
-    </message>
-    <message>
-      <source>Vidalia Control Panel</source>
-      <translation>Vidalias Kontrollpanel</translation>
-    </message>
-    <message>
-      <source>Tor Status</source>
-      <translation>Tor Status</translation>
-    </message>
-    <message>
-      <source>Vidalia Shortcuts</source>
-      <translation>Vidalia Snareveier</translation>
-    </message>
-    <message>
-      <source>Setup Relaying</source>
-      <translation>Konfigurer Formidling</translation>
-    </message>
-    <message>
-      <source>Set up a Tor relay and help the network grow</source>
-      <translation>KjÃr en Tor mellommann og hjelp nettverket vokse</translation>
-    </message>
-    <message>
-      <source>View the Network</source>
-      <translation>Vis Nettverket</translation>
-    </message>
-    <message>
-      <source>View a map of the Tor network</source>
-      <translation>Vis kart over Tor-nettverket</translation>
-    </message>
-    <message>
-      <source>Use a New Identity</source>
-      <translation>Bruk Ny Identitet</translation>
-    </message>
-    <message>
-      <source>Make subsequent connections appear new</source>
-      <translation>GjÃr at pÃgÃende forbindelser ser ut som nye</translation>
-    </message>
-    <message>
-      <source>View Tor's bandwidth usage</source>
-      <translation>Vis Tors bÃndbreddebruk</translation>
-    </message>
-    <message>
-      <source>View Tor's log message history</source>
-      <translation>Vis historikken for Tor sin meldingslogg</translation>
-    </message>
-    <message>
-      <source>View help documentation</source>
-      <translation>Vis hjelpetekstene</translation>
-    </message>
-    <message>
-      <source>Configure Tor and Vidalia</source>
-      <translation>Konfigurer Tor og Vidalia</translation>
-    </message>
-    <message>
-      <source>View version and license information</source>
-      <translation>Vis versjon og lisens informasjon</translation>
-    </message>
-    <message>
-      <source>Exit Vidalia</source>
-      <translation>Avslutt Vidalia</translation>
-    </message>
-    <message>
-      <source>Show this window on startup</source>
-      <translation>Vis dette vinduet ved oppstart</translation>
-    </message>
-    <message>
-      <source>Hide</source>
-      <translation>Skjul</translation>
-    </message>
-    <message>
-      <source>Hide this window</source>
-      <translation>Skjul dette vinduet</translation>
-    </message>
-  </context>
-  <context>
-    <name>MessageLog</name>
-    <message>
-      <source>Message Log</source>
-      <translation>Meldings Logg</translation>
-    </message>
-    <message>
-      <source>Time</source>
-      <translation>Tid</translation>
-    </message>
-    <message>
-      <source>Type</source>
-      <translation>Type</translation>
-    </message>
-    <message>
-      <source>Message</source>
-      <translation>Melding</translation>
-    </message>
-    <message>
-      <source>Browse</source>
-      <translation>Bla</translation>
-    </message>
-    <message>
-      <source>Saves the current Message Log settings</source>
-      <translation>Lagr de nÃvÃrende innstillingene for Meldingloggen</translation>
-    </message>
-    <message>
-      <source>Save Settings</source>
-      <translation>Lagr Inntillinger</translation>
-    </message>
-    <message>
-      <source>Cancels changes made to settings</source>
-      <translation>Avbryter endring av innstillingene</translation>
-    </message>
-    <message>
-      <source>Cancel</source>
-      <translation>Avbryt</translation>
-    </message>
-    <message>
-      <source>Message Filter</source>
-      <translation>Meldings FIlter</translation>
-    </message>
-    <message>
-      <source>Error</source>
-      <translation>Feil</translation>
-    </message>
-    <message>
-      <source>Warning</source>
-      <translation>Advarsel</translation>
-    </message>
-    <message>
-      <source>Notice</source>
-      <translation>Merknad</translation>
-    </message>
-    <message>
-      <source>Info</source>
-      <translation>Info</translation>
-    </message>
-    <message>
-      <source>Debug</source>
-      <translation>Avlus</translation>
-    </message>
-    <message>
-      <source>Message Filters...</source>
-      <translation>Meldingsfilter</translation>
-    </message>
-    <message>
-      <source>Set message filters</source>
-      <translation>Skru pÃ meldingsfiltrering</translation>
-    </message>
-    <message>
-      <source>History Size...</source>
-      <translation>Historikk StÃrrelse...</translation>
-    </message>
-    <message>
-      <source>Set maximum number of messages to display</source>
-      <translation>Set maksimum antall meldinger som vises</translation>
-    </message>
-    <message>
-      <source>Clear</source>
-      <translation>TÃm</translation>
-    </message>
-    <message>
-      <source>Clear all messages from the Message Log (Ctrl+E)</source>
-      <translation>TÃm alle meldinger fra Meldingslogge (Ctrl+E)</translation>
-    </message>
-    <message>
-      <source>Ctrl+E</source>
-      <translation>Ctrl+E</translation>
-    </message>
-    <message>
-      <source>Copy</source>
-      <translation>Kopier</translation>
-    </message>
-    <message>
-      <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
-      <translation>Kopier valgte meldinger til utklippstavlen (Ctrl+C)</translation>
-    </message>
-    <message>
-      <source>Ctrl+C</source>
-      <translation>Ctrl+C</translation>
-    </message>
-    <message>
-      <source>Select All</source>
-      <translation>Velg alt</translation>
-    </message>
-    <message>
-      <source>Select all messages (Ctrl+A)</source>
-      <translation>Velg alle meldinger (Ctrl+A)</translation>
-    </message>
-    <message>
-      <source>Ctrl+A</source>
-      <translation>Ctrl+A</translation>
-    </message>
-    <message>
-      <source>Save All</source>
-      <translation>Lagr Alt</translation>
-    </message>
-    <message>
-      <source>Save all messages to a file</source>
-      <translation>Lagr alle meldinger til en fil</translation>
-    </message>
-    <message>
-      <source>Save Selected</source>
-      <translation>Lagr merket</translation>
-    </message>
-    <message>
-      <source>Save selected messages to a file</source>
-      <translation>Lagr valgte meldinger i en fil</translation>
-    </message>
-    <message>
-      <source>Close</source>
-      <translation>Lukk</translation>
-    </message>
-    <message>
-      <source>Close the Message Log</source>
-      <translation>Lukk Meldingsloggen</translation>
-    </message>
-    <message>
-      <source>Esc</source>
-      <translation>Esc</translation>
-    </message>
-    <message>
-      <source>Find</source>
-      <translation>Finn </translation>
-    </message>
-    <message>
-      <source>Find all messages containing the search text (Ctrl+F)</source>
-      <translation>Finn alle meldinger som inneholder sÃketeksten (Ctrl+F)</translation>
-    </message>
-    <message>
-      <source>Ctrl+F</source>
-      <translation>Ctrl+F</translation>
-    </message>
-    <message>
-      <source>Messages that appear when something has 
-gone very wrong and Tor cannot proceed.</source>
-      <translation>Meldinger som vises om noe har gÃtt veldig galt og Tor ikke kan fortsette.</translation>
-    </message>
-    <message>
-      <source>Messages that only appear when 
-something has gone wrong with Tor.</source>
-      <translation>Meldinger som kun vises nÃr noe har gÃtt galt med Tor.</translation>
-    </message>
-    <message>
-      <source>Messages that appear infrequently 
-during normal Tor operation and are 
-not considered errors, but you may 
-care about.</source>
-      <translation>Meldinger som sjelden vises ved normal Tor-aktivitet og som ikke regnes som feil men likevel kan vÃre av interesse.</translation>
-    </message>
-    <message>
-      <source>Messages that appear frequently 
-during normal Tor operation.</source>
-      <translation>Meldinger som stadig vises ved vanlig Tor-aktivitet.</translation>
-    </message>
-    <message>
-      <source>Hyper-verbose messages primarily of 
-interest to Tor developers.</source>
-      <translation>Ekstra-detaljerte meldinger er primÃrt nyttig for Tor-utviklere.</translation>
-    </message>
-    <message>
-      <source>Error Setting Filter</source>
-      <translation>Feilet ved setting av Filter</translation>
-    </message>
-    <message>
-      <source>Error Opening Log File</source>
-      <translation>Feil ved Ãpning av Logg-Fil</translation>
-    </message>
-    <message>
-      <source>Select Log File</source>
-      <translation>Velg Logg-fil</translation>
-    </message>
-    <message>
-      <source>Save Log Messages</source>
-      <translation>Lagr Logg-meldinger</translation>
-    </message>
-    <message>
-      <source>Vidalia</source>
-      <translation>Vidalia</translation>
-    </message>
-    <message>
-      <source>Find in Message Log</source>
-      <translation>Fin i Meldingsloggen</translation>
-    </message>
-    <message>
-      <source>Find:</source>
-      <translation>Finn:</translation>
-    </message>
-    <message>
-      <source>Not Found</source>
-      <translation>Ikke Funnet</translation>
-    </message>
-    <message>
-      <source>Search found 0 matches.</source>
-      <translation>SÃket ga 0 resultater.</translation>
-    </message>
-    <message>
-      <source>Settings</source>
-      <translation>Innstillinger</translation>
-    </message>
-    <message>
-      <source>Adjust Message Log Settings</source>
-      <translation>Tilpass Innstillinger for Meldingloggen</translation>
-    </message>
-    <message>
-      <source>Ctrl+T</source>
-      <translation>Ctrl+T</translation>
-    </message>
-    <message>
-      <source>Help</source>
-      <translation>Hjelp</translation>
-    </message>
-    <message>
-      <source>Show the help browser</source>
-      <translation>Vis hjelp-leseren</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to register for Tor's log events.</source>
-      <translation>Vidalia klarte ikke hente ut Tors logg-hendelser.</translation>
-    </message>
-    <message>
-      <source>Cannot write file %1
-
-%2.</source>
-      <translation>Kunne ikke skrive fil %1
-
-%2.</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to open the specified log file.</source>
-      <translation>Vidalia kunne ikke Ã Ãpne spesifisert logg-fil.</translation>
-    </message>
-    <message>
-      <source>Text Files (*.txt)</source>
-      <translation>Tekst Filer (*.txt)</translation>
-    </message>
-    <message>
-      <source>F1</source>
-      <translation>F1</translation>
-    </message>
-    <message>
-      <source>Log Filename Required</source>
-      <translation>Logg-Filnavn PÃkrevd</translation>
-    </message>
-    <message>
-      <source>You must enter a filename to be able to save log messages to a file.</source>
-      <translation>Du mÃ oppgi ett filnavn for Ã kunne lagre meldingsloggen til en fil.</translation>
-    </message>
-    <message>
-      <source>Message Log History</source>
-      <translation>Meldingshistorikk</translation>
-    </message>
-    <message>
-      <source>Number of messages to display in the message log window</source>
-      <translation>Antall meldinger som vises i meldingsvinduet</translation>
-    </message>
-    <message>
-      <source>messages</source>
-      <translation>meldinger</translation>
-    </message>
-    <message>
-      <source>Always Save New Log Messages</source>
-      <translation>Lagr alltid nye Logg-meldinger</translation>
-    </message>
-    <message>
-      <source>Enable automatically saving all new log messages to a file</source>
-      <translation>Skru pÃ automatisk lagring av alle nye logg-meldinger til en fil</translation>
-    </message>
-    <message>
-      <source>Automatically save new log messages to a file</source>
-      <translation>Lagr automatisk nye logg-meldinger til en fil</translation>
-    </message>
-  </context>
-  <context>
-    <name>NetViewer</name>
-    <message>
-      <source>View Tor Network</source>
-      <translation>Vis Tor-Nettverket</translation>
-    </message>
-    <message>
-      <source>Refresh</source>
-      <translation>Oppdater</translation>
-    </message>
-    <message>
-      <source>Help</source>
-      <translation>Hjelp</translation>
-    </message>
-    <message>
-      <source>Close</source>
-      <translation>Lukk</translation>
-    </message>
-    <message>
-      <source>Zoom In</source>
-      <translation>Zoom Inn</translation>
-    </message>
-    <message>
-      <source>Zoom Out</source>
-      <translation>Zoom Ut</translation>
-    </message>
-    <message>
-      <source>Refresh the list of routers and connections</source>
-      <translation>Oppdater listen over routere og forbindelser</translation>
-    </message>
-    <message>
-      <source>Show the network map help</source>
-      <translation>Vis hjelpeteksten for nettverkskartet</translation>
-    </message>
-    <message>
-      <source>Close the network map</source>
-      <translation>Lukk nettverks-kartet</translation>
-    </message>
-    <message>
-      <source>Zoom in on the network map</source>
-      <translation>Zoom inn pÃ nettverks-kartet</translation>
-    </message>
-    <message>
-      <source>Zoom out on the network map</source>
-      <translation>Zoom ut pÃ nettverks-kartet</translation>
-    </message>
-    <message>
-      <source>Zoom To Fit</source>
-      <translation>Zoom til Ã passe</translation>
-    </message>
-    <message>
-      <source>Zooms to fit all currently displayed circuits</source>
-      <translation>Zoomer slik at det passer alle viste forbindelser</translation>
-    </message>
-    <message>
-      <source>Ctrl+R</source>
-      <translation>Ctrl+R</translation>
-    </message>
-    <message>
-      <source>F1</source>
-      <translation>F1</translation>
-    </message>
-    <message>
-      <source>Esc</source>
-      <translation>Esc</translation>
-    </message>
-    <message>
-      <source>+</source>
-      <translation>+</translation>
-    </message>
-    <message>
-      <source>-</source>
-      <translation>-</translation>
-    </message>
-    <message>
-      <source>Ctrl+Z</source>
-      <translation>Ctrl+Z</translation>
-    </message>
-    <message>
-      <source>Show network map help</source>
-      <translation>Vis hjelpetekst for nettverks-kartet</translation>
-    </message>
-  </context>
-  <context>
-    <name>Policy</name>
-    <message>
-      <source>accept</source>
-      <translation>aksepter</translation>
-    </message>
-    <message>
-      <source>reject</source>
-      <translation>nekt</translation>
-    </message>
-  </context>
-  <context>
-    <name>RouterDescriptor</name>
-    <message>
-      <source>Online</source>
-      <translation>Tilkoblet</translation>
-    </message>
-    <message>
-      <source>Hibernating</source>
-      <translation>Sover</translation>
-    </message>
-    <message>
-      <source>Offline</source>
-      <translation>Frakoblet</translation>
-    </message>
-  </context>
-  <context>
-    <name>RouterDescriptorView</name>
-    <message>
-      <source>IP Address:</source>
-      <translation>IP Adresse:</translation>
-    </message>
-    <message>
-      <source>Platform:</source>
-      <translation>Plattform:</translation>
-    </message>
-    <message>
-      <source>Bandwidth:</source>
-      <translation>BÃndbredde:</translation>
-    </message>
-    <message>
-      <source>Uptime:</source>
-      <translation>Oppetid:</translation>
-    </message>
-    <message>
-      <source>Last Updated:</source>
-      <translation>Sist Oppdatert:</translation>
-    </message>
-    <message>
-      <source>Location:</source>
-      <translation>Sted:</translation>
-    </message>
-  </context>
-  <context>
-    <name>RouterListItem</name>
-    <message>
-      <source>%1 KB/s</source>
-      <translation>%1 KB/s</translation>
-    </message>
-    <message>
-      <source>Offline</source>
-      <translation>Frakoblet</translation>
-    </message>
-    <message>
-      <source>Hibernating</source>
-      <translation>Sover</translation>
-    </message>
-  </context>
-  <context>
-    <name>RouterListWidget</name>
-    <message>
-      <source>Server</source>
-      <translation>Tjener</translation>
-    </message>
-    <message>
-      <source>Zoom to Server</source>
-      <translation>Zoom til Tjener</translation>
-    </message>
-    <message>
-      <source>%1 servers online (%2 total)</source>
-      <translation>%1 aktive tjenere (%2 totalt)</translation>
-    </message>
-  </context>
-  <context>
-    <name>ServerPage</name>
-    <message>
-      <source>Check to run as a Tor network server</source>
-      <translation>Kryss av for Ã kjÃre Tor som en tjener</translation>
-    </message>
-    <message>
-      <source>Relay traffic for the Tor network</source>
-      <translation>Videresend trafikk for Tor-nettverket</translation>
-    </message>
-    <message>
-      <source>Directory Port:</source>
-      <translation>Katalog Port:</translation>
-    </message>
-    <message>
-      <source>Directory Port Number</source>
-      <translation>Katalog Port Nummer</translation>
-    </message>
-    <message>
-      <source>Nickname:</source>
-      <translation>Kallenavn:</translation>
-    </message>
-    <message>
-      <source>Name of your server</source>
-      <translation>Navnet pÃ tjeneren din</translation>
-    </message>
-    <message>
-      <source>Contact Info:</source>
-      <translation>Kontakt Info:</translation>
-    </message>
-    <message>
-      <source>Server Port:</source>
-      <translation>Tjener Port:</translation>
-    </message>
-    <message>
-      <source>Port on which users and other servers can communicate with your server</source>
-      <translation>Porten som brukere og tjenere kan bruke til Ã kommunisere med din tjener</translation>
-    </message>
-    <message>
-      <source>Address:</source>
-      <translation>Adresse:</translation>
-    </message>
-    <message>
-      <source>Domain name or IP address of your server</source>
-      <translation>Domenenavn eller IP-adressen til tjeneren din</translation>
-    </message>
-    <message>
-      <source>Enable to mirror the server directory</source>
-      <translation>SKru pÃ for Ã speile tjener-katalogen</translation>
-    </message>
-    <message>
-      <source>Mirror the Server Directory </source>
-      <translation>Spil Tjener-katalogen</translation>
-    </message>
-    <message>
-      <source>Attempts to determine the correct address for your server</source>
-      <translation>ForsÃker Ã finne ut den riktige adressen for tjeneren din</translation>
-    </message>
-    <message>
-      <source>Get Address</source>
-      <translation>Hent Adresse</translation>
-    </message>
-    <message>
-      <source>Exit Policies</source>
-      <translation>Utgangs-Politikk</translation>
-    </message>
-    <message>
-      <source>Show help topic on exit policies</source>
-      <translation>Vis hjelpeteksten for tillatte utgÃende forbindelser</translation>
-    </message>
-    <message>
-      <source>You must specify at least a server nickname and port.</source>
-      <translation>Du mÃ minimum oppgi tjenerens kallenavn og port</translation>
-    </message>
-    <message>
-      <source>Error</source>
-      <translation>Feil</translation>
-    </message>
-    <message>
-      <source>Vidalia was unable to determine your public IP address.</source>
-      <translation>
-Vidalia klarte ikke Ã finne ut hvilken IP-adresse du har.</translation>
-    </message>
-    <message>
-      <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 klarte bare finne den private IP-adressen til tjeneren din. 
-
-Vil du bruke en ekstern tjeneste for Ã finne ut din offentlige IP-adresse?</translation>
-    </message>
-    <message>
-      <source>When enabled, Vidalia will periodically update your IP address if necessary</source>
-      <translation>Hvis denne funksjonen er skrudd pÃ vil Vidalia periodisk oppdatere IP-adressen din om det er nÃdvendig</translation>
-    </message>
-    <message>
-      <source>Automatically Update</source>
-      <translation>Oppdater Automatisk</translation>
-    </message>
-    <message>
-      <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>E-post adresse hvor det er mulig Ã fÃ tak i deg hvis tjeneren din sliter. Du kan ogsÃ inkludere ditt PGP eller GPG fingeravtrykk.</translation>
-    </message>
-    <message>
-      <source>Long-term average bandwidth limit</source>
-      <translation>Gjennomsnittlig langvarig bÃndbredde-begensning</translation>
-    </message>
-    <message>
-      <source>Average Rate</source>
-      <translation>Gjennomsnittshastighet</translation>
-    </message>
-    <message>
-      <source>KB/s</source>
-      <translation>KB/s</translation>
-    </message>
-    <message>
-      <source>Peak bandwidth rate limit</source>
-      <translation>Begrensning for kortvarige bÃnbredde-topper</translation>
-    </message>
-    <message>
-      <source>Maximum Rate</source>
-      <translation>Maksimal Hastighet</translation>
-    </message>
-    <message>
-      <source>Show help topic on bandwidth rate limits</source>
-      <translation>Hvis hjelpeteksten for bÃndbredde-begrensning</translation>
-    </message>
-    <message>
-      <source>Basic Settings</source>
-      <translation>Grunnleggende Innstillinger</translation>
-    </message>
-    <message>
-      <source>Bandwidth Limits</source>
-      <translation>BÃndbredde Begrensinger</translation>
-    </message>
-    <message>
-      <source>For Internet connections with fast download speed but slow upload, please list your upload speed here.</source>
-      <translation>Vennligst oppgi din opplastningshastighet her hvis du har rask nedlastningshastighet med treg opplastningshastighet.</translation>
-    </message>
-    <message>
-      <source>Select the entry that most closely resembles your Internet connection</source>
-      <translation>Velg det som best reflekterer Internett-forbindelsen din</translation>
-    </message>
-    <message>
-      <source>Cable/DSL 256 Kbps</source>
-      <translation>Kabel/DSL 256 Kbps</translation>
-    </message>
-    <message>
-      <source>Cable/DSL 512 Kbps</source>
-      <translation>Kabel/DSL 512 Kbps</translation>
-    </message>
-    <message>
-      <source>Cable/DSL 768 Kbps</source>
-      <translation>Kabel/DSL 768 Kbps</translation>
-    </message>
-    <message>
-      <source>T1/Cable/DSL 1.5 Mbps</source>
-      <translation>T1/Kabel/DSL 1,5 Mbps</translation>
-    </message>
-    <message>
-      <source>> 1.5 Mbps</source>
-      <translation>> 1.5 Mbps</translation>
-    </message>
-    <message>
-      <source>Custom</source>
-      <translation>Egendefinert</translation>
-    </message>
-    <message>
-      <source>Ports 6660 - 6669 and 6697</source>
-      <translation>Port 6660 - 6669 og 6697</translation>
-    </message>
-    <message>
-      <source>Internet Relay Chat (IRC)</source>
-      <translation>Internett Relay Chat (IRC)</translation>
-    </message>
-    <message>
-      <source>Ports 110, 143, 993 and 995</source>
-      <translation>Port 110, 143, 993 og 995</translation>
-    </message>
-    <message>
-      <source>Retrieve Mail (POP, IMAP)</source>
-      <translation>Motta E-Post (POP, IMAP)</translation>
-    </message>
-    <message>
-      <source>Ports unspecified by other checkboxes</source>
-      <translation>Porter ikke angitt i andre avkryssningsbokser</translation>
-    </message>
-    <message>
-      <source>Misc Other Services</source>
-      <translation>Diverse Andre Tjenester</translation>
-    </message>
-    <message>
-      <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
-      <translation>Port 706, 1863, 5050, 5190, 5222, 8300 og 8888</translation>
-    </message>
-    <message>
-      <source>Instant Messaging (IM)</source>
-      <translation>Bruker-Til-Bruker meldinger (IM)</translation>
-    </message>
-    <message>
-      <source>Port 443</source>
-      <translation>Port 443</translation>
-    </message>
-    <message>
-      <source>Secure Websites (SSL)</source>
-      <translation>Sikre Nettsider (SSL)</translation>
-    </message>
-    <message>
-      <source>Port 80</source>
-      <translation>Port 80</translation>
-    </message>
-    <message>
-      <source>Websites</source>
-      <translation>Nettsider</translation>
-    </message>
-    <message>
-      <source>What Internet resources should Tor users be able to access from your Tor relay?</source>
-      <translation>Hvilke Internett-ressursjer skal Tor-brukere fÃ lov Ã benytte fra din Tor-tjener?</translation>
-    </message>
-    <message>
-      <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>Din maksimale bÃndbredde-grense mÃ vÃre stÃrre enn eller lik din gjennomsnittsgrense. Begge verdiene mÃ vÃre minst 20 KB/s.</translation>
-    </message>
-  </context>
-  <context>
-    <name>Stream</name>
-    <message>
-      <source>New</source>
-      <translation>Ny</translation>
-    </message>
-    <message>
-      <source>Resolving</source>
-      <translation>SlÃr opp</translation>
-    </message>
-    <message>
-      <source>Connecting</source>
-      <translation>Tilknytter</translation>
-    </message>
-    <message>
-      <source>Open</source>
-      <translation>Ãpen</translation>
-    </message>
-    <message>
-      <source>Failed</source>
-      <translation>Feilet</translation>
-    </message>
-    <message>
-      <source>Closed</source>
-      <translation>Lukket</translation>
-    </message>
-    <message>
-      <source>Unknown</source>
-      <translation>Ukjent</translation>
-    </message>
-    <message>
-      <source>Retrying</source>
-      <translation>PrÃver igjen</translation>
-    </message>
-  </context>
-  <context>
-    <name>TorProcess</name>
-    <message>
-      <source>Process %1 failed to stop. [%2]</source>
-      <translation>Prosess %1 nektet Ã stoppe. [%2]</translation>
-    </message>
-  </context>
-  <context>
-    <name>TorService</name>
-    <message>
-      <source>The Tor service is not installed.</source>
-      <translation>Tor tjenesten er ikke installert</translation>
-    </message>
-    <message>
-      <source>Unable to start the Tor service.</source>
-      <translation>Kunne ikke starte Tor-tjeneren.</translation>
-    </message>
-  </context>
-  <context>
-    <name>VMessageBox</name>
-    <message>
-      <source>OK</source>
-      <translation>OK</translation>
-    </message>
-    <message>
-      <source>Cancel</source>
-      <translation>Avbryt</translation>
-    </message>
-    <message>
-      <source>Yes</source>
-      <translation>Ja</translation>
-    </message>
-    <message>
-      <source>No</source>
-      <translation>Nei</translation>
-    </message>
-    <message>
-      <source>Help</source>
-      <translation>Hjelp</translation>
-    </message>
-    <message>
-      <source>Retry</source>
-      <translation>PrÃv igjen</translation>
-    </message>
-    <message>
-      <source>Show Log</source>
-      <translation>Vis Logg</translation>
-    </message>
-    <message>
-      <source>Show Settings</source>
-      <translation>Vis Innstillinger</translation>
-    </message>
-    <message>
-      <source>Continue</source>
-      <translation>Fortsett</translation>
-    </message>
-    <message>
-      <source>Quit</source>
-      <translation>Avslutt</translation>
-    </message>
-  </context>
-  <context>
-    <name>Vidalia</name>
-    <message>
-      <source>Invalid language code specified: </source>
-      <translation>Ugyldig sprÃk-kode spesifisert: </translation>
-    </message>
-    <message>
-      <source>Invalid GUI style specified: </source>
-      <translation>Ugyldig GUI-stil spesifisert:</translation>
-    </message>
-    <message>
-      <source>Vidalia is already running</source>
-      <translation>Vidalia kjÃrer allerede</translation>
-    </message>
-    <message>
-      <source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
-
-Would you like to continue starting Vidalia?</source>
-      <translation>Vidalia oppdaget en annen Vidalia-prosess og bÃr derfor ikke startes. Hvis dette er feil kan du likevel starte Vidalia. 
-
-Vil du fortsette og starte Vidalia?</translation>
-    </message>
-    <message>
-      <source>Invalid Argument</source>
-      <translation>Ugyldig Argument</translation>
-    </message>
-    <message>
-      <source>Displays this usage message and exits.</source>
-      <translation>Viser denne brukesmeldingen og avslutter.</translation>
-    </message>
-    <message>
-      <source>Resets ALL stored Vidalia settings.</source>
-      <translation>Tilbakestill ALLE *lagrede* innstillinger for Vidalia.</translation>
-    </message>
-    <message>
-      <source>Sets the directory Vidalia uses for data files.</source>
-      <translation>Velger mappen Vidalia bruker for sine datafiler.</translation>
-    </message>
-    <message>
-      <source>Sets the name and location of Vidalia's pidfile.</source>
-      <translation>Gir navn og plassering av Vidalia sin pid-fil.</translation>
-    </message>
-    <message>
-      <source>Sets the name and location of Vidalia's logfile.</source>
-      <translation>Gir navn og plassering av Vidalia sin loggfil.</translation>
-    </message>
-    <message>
-      <source>Sets the verbosity of Vidalia's logging.</source>
-      <translation>Velger mengden informasjon Vidalia logger.</translation>
-    </message>
-    <message>
-      <source>Sets Vidalia's interface style.</source>
-      <translation>Velger stil for Vidalia sitt brukergrensesnitt.</translation>
-    </message>
-    <message>
-      <source>Sets Vidalia's language.</source>
-      <translation>Velger Vidalia sitt sprÃk.</translation>
-    </message>
-    <message>
-      <source>Vidalia Usage Information</source>
-      <translation>Vidalia Bruksinformasjon</translation>
-    </message>
-    <message>
-      <source>Invalid log level specified: </source>
-      <translation>Ugyldig loggnivÃ valgt: </translation>
-    </message>
-    <message>
-      <source>Unable to open log file '%1': %2</source>
-      <translation>Kunne ikke Ãpne loggfil '%1': %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>Om Vidalia </translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="344"/>
+        <source>Vidalia</source>
+        <translation>Vidalia</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="512"/>
+        <source>Tor</source>
+        <translation>Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="428"/>
+        <source>Qt</source>
+        <translation>Qt</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="443"/>
+        <source>Qt Version</source>
+        <translation>Qt Versjon </translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="528"/>
+        <source>Tor Version</source>
+        <translation>Tor Versjon</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.ui" line="359"/>
+        <source>Vidalia Version</source>
+        <translation>Vidalia Versjon</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.cpp" line="79"/>
+        <source>&lt;Not Running&gt;</source>
+        <translation>&lt;KjÃrer ikke&gt;</translation>
+    </message>
+    <message>
+        <location filename="../gui/about/aboutdialog.cpp" line="75"/>
+        <source>&lt;Unavailable&gt;</source>
+        <translation>&lt;Utilgjengelig&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>AdvancedPage</name>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="502"/>
+        <source>Control Port</source>
+        <translation>Kontroll Port</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="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>Start Tor med den spesifiserte konfigurasjonsfilen (torrc)</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="644"/>
+        <source>Select path to Tor configuration file</source>
+        <translation>Filsti til Tor sin konfigurasjonsfil</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="647"/>
+        <source>Browse</source>
+        <translation>Bla</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="666"/>
+        <source>Permissions</source>
+        <translation>Tillatelser</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="689"/>
+        <source>Run as User:</source>
+        <translation>KjÃr som Bruker:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="702"/>
+        <source>Vidalia will run with this User&apos;s permissions</source>
+        <translation>Vidalia vil kjÃre med denne brukerens tillatelser</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="722"/>
+        <source>Run as Group:</source>
+        <translation>KjÃr under Gruppe:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="729"/>
+        <source>Vidalia will run with this Group&apos;s permissions</source>
+        <translation>Vidalia vil kjÃre med denne Gruppen&apos;s tillatelser</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="119"/>
+        <source>Select Tor Configuration File</source>
+        <translation>Velg Konfigurasjonsfil for Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="132"/>
+        <source>File Not Found</source>
+        <translation>Finner Ikke Filen</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 finnes ikke. Vil du lage den?</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="145"/>
+        <source>Failed to Create File</source>
+        <translation>Klarte ikke Lage FIl</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="146"/>
+        <source>Unable to create %1 [%2]</source>
+        <translation>Kunne ikke opprette %1 [%2]</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="753"/>
+        <source>Service</source>
+        <translation>Tjeneste</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>Skru dette pÃ om du vil kjÃre Tor som en WIndows-tjeneste</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="771"/>
+        <source>Run Tor in the background as a Windows service</source>
+        <translation>KjÃr Tor i bakgrunnen som en Windows-tjeneste</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="169"/>
+        <source>Unable to remove Tor Service</source>
+        <translation>Kunne ikke fjerne Tor-tjenesten</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="180"/>
+        <source>Unable to install Tor Service</source>
+        <translation>Kunne ikke installere Tor-tjenesten</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="181"/>
+        <source>Vidalia was unable to install the Tor service.</source>
+        <translation>Vidalia klarte ikke installere Tor-tjenesten</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="171"/>
+        <source>Vidalia was unable to remove the Tor service.
+
+You may need to remove it manually.</source>
+        <translation>Vidalia klarte ikke installere Tor-tjenesten 
+
+Du mÃ kanskje fjerne den manuellt.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="604"/>
+        <source>Tor Configuration File</source>
+        <translation>Tors Konfigurasjonsfil</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="573"/>
+        <source>Port that Vidalia uses to communicate with Tor.</source>
+        <translation>Porten som Vidalia bruker til Ã kommunisere med Tor.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.cpp" line="80"/>
+        <source>&apos;%1&apos; is not a valid IP address.</source>
+        <translation>&apos;%1&apos; er ikke en gyldig IP adresse.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/advancedpage.ui" line="542"/>
+        <source>IP address on which Tor is listening for controller connections.</source>
+        <translation>IP adresse som Tor lytter etter kontroller-forbindelser pÃ.</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>SprÃk</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="322"/>
+        <source>Choose the language used in Vidalia</source>
+        <translation>Velg sprÃket du vil Vidalia skal bruke</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="354"/>
+        <source>Changes to language will only take effect after restarting Vidalia!</source>
+        <translation>Endringer av valgt sprÃk trer fÃrst i kraft etter du starter Vidalia pÃ ny!</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="370"/>
+        <source>Style</source>
+        <translation>Stil</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/appearancepage.ui" line="404"/>
+        <source>Choose Vidalia&apos;s interface style</source>
+        <translation>Velg stil for Vidalia&apos;s grensesnitt</translation>
+    </message>
+</context>
+<context>
+    <name>BandwidthGraph</name>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="490"/>
+        <source>Tor Bandwidth Usage</source>
+        <translation>Tors BÃndbredde-Bruk</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="514"/>
+        <source>Show Settings</source>
+        <translation>Vis Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="537"/>
+        <source>Reset</source>
+        <translation>Nullstill</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="630"/>
+        <source>Receive Rate</source>
+        <translation>InngÃende Hastighet</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="654"/>
+        <source>Send Rate</source>
+        <translation>UtgÃende Hastighet</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="773"/>
+        <source>Changes the transparency of the Bandwidth Graph</source>
+        <translation>Endringer gjennomsiktigheten av BÃndbredde-Grafen</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="932"/>
+        <source>Save</source>
+        <translation>Lagr</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="939"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.cpp" line="170"/>
+        <source>Since:</source>
+        <translation>Siden:</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>% Ugjennomsiktig</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.cpp" line="236"/>
+        <source>Hide Settings</source>
+        <translation>Skjul Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="667"/>
+        <source>Always on Top</source>
+        <translation>Alltid Ãverst</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="723"/>
+        <source>Style</source>
+        <translation>Stil</translation>
+    </message>
+</context>
+<context>
+    <name>Circuit</name>
+    <message>
+        <location filename="../control/circuit.cpp" line="109"/>
+        <source>New</source>
+        <translation>Ny</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="110"/>
+        <source>Open</source>
+        <translation>Ãpen</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="111"/>
+        <source>Building</source>
+        <translation>Bygger</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="112"/>
+        <source>Failed</source>
+        <translation>Feilet</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="113"/>
+        <source>Closed</source>
+        <translation>Lukket</translation>
+    </message>
+    <message>
+        <location filename="../control/circuit.cpp" line="114"/>
+        <source>Unknown</source>
+        <translation>Ukjent</translation>
+    </message>
+</context>
+<context>
+    <name>CircuitItem</name>
+    <message>
+        <location filename="../gui/network/circuititem.cpp" line="48"/>
+        <source>&lt;Path Empty&gt;</source>
+        <translation>&lt;Tom Sti&gt;</translation>
+    </message>
+</context>
+<context>
+    <name>CircuitListWidget</name>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
+        <source>Connection</source>
+        <translation>Forbindelse</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>Lukk Krets</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="62"/>
+        <source>Close Stream</source>
+        <translation>Lukk StrÃm</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="55"/>
+        <source>Zoom to Circuit</source>
+        <translation>Zoom til Krets</translation>
+    </message>
+</context>
+<context>
+    <name>ConfigDialog</name>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="56"/>
+        <source>General</source>
+        <translation>Generell</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="59"/>
+        <source>Server</source>
+        <translation>Tjener</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="65"/>
+        <source>Advanced</source>
+        <translation>Avansert</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="83"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="62"/>
+        <source>Appearance</source>
+        <translation>Utseende</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="78"/>
+        <source>Save</source>
+        <translation>Lagr</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="154"/>
+        <source>Error Saving Configuration</source>
+        <translation>Feil ved Lagring av Konfigurasjon</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.cpp" line="74"/>
+        <source>Help</source>
+        <translation>Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/configdialog.ui" line="289"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
+    </message>
+</context>
+<context>
+    <name>ControlConnection</name>
+    <message>
+        <location filename="../control/controlconnection.cpp" line="294"/>
+        <source>Control socket is not connected.</source>
+        <translation>Kontroll-porten er ikke tilkoblet.</translation>
+    </message>
+    <message>
+        <location filename="../control/controlconnection.cpp" line="239"/>
+        <source>Control socket is not connected</source>
+        <translation>Kontroll-porten er ikke tilkoblet.</translation>
+    </message>
+</context>
+<context>
+    <name>ControlSocket</name>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="65"/>
+        <source>Error connecting to %1:%2 [%3]</source>
+        <translation>Feil ved tilkobling til %1:%2 [%3]</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="101"/>
+        <source>Error disconnecting socket. [%1]</source>
+        <translation>Feil ved frakobling av forbindelse [%1]</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="159"/>
+        <source>Error sending control command. [%1]</source>
+        <translation>Feil ved sending av kontroll-kommando. [%1]</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="196"/>
+        <source>Socket disconnected while attempting to read a line of data.</source>
+        <translation>Forbindelsen ble avbrutt under forsÃk pÃ Ã lese en linje med data.</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="234"/>
+        <source>Invalid control reply. [%1]</source>
+        <translation>Ugyldig kontroll-svar: [%1]</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="150"/>
+        <source>Control socket is not connected.</source>
+        <translation>Kontroll-porten er ikke tilkoblet.</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="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 klarte ikke Ã fastslÃ Tors kontroll-protokoll versjon. Verifiser at du har angitt riktig kontroll-port og at du bruker en nyere utgave av Tor.</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="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 stÃtter kun Versjon 1 av Tor&apos;s kontrollprotokoll (versjon %1 detektert). 
+Oppgrader til en nyere utgave av Tor.</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>Sti til Tor&apos;s kjÃrbare programfil</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="353"/>
+        <source>Select path to Tor executable</source>
+        <translation>Velg filsti til Tor&apos;s programfil</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="356"/>
+        <source>Browse</source>
+        <translation>Bla</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="375"/>
+        <source>Startup Options</source>
+        <translation>Oppstartsvalg</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="390"/>
+        <source>Select to start Vidalia on system boot</source>
+        <translation>Velg for Ã starte Vidalia ved systemoppstart</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="393"/>
+        <source>Run Vidalia on system startup</source>
+        <translation>KjÃr Vidalia ved system-oppstart</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="406"/>
+        <source>Set to start Tor when you launch Vidalia</source>
+        <translation>Skru pÃ for Ã starte Tor nÃr du starter Vidalia</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="409"/>
+        <source>Start Tor when Vidalia starts</source>
+        <translation>Start Tor nÃr Vidalia starter</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.cpp" line="72"/>
+        <source>Select Path to Tor</source>
+        <translation>Velg filsti til Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.ui" line="307"/>
+        <source>Tor Executable</source>
+        <translation>Tor Programfilen</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/generalpage.cpp" line="63"/>
+        <source>Executables (*.exe)</source>
+        <translation>KjÃrbare (*.exe)</translation>
+    </message>
+</context>
+<context>
+    <name>GraphFrame</name>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="248"/>
+        <source>Recv: </source>
+        <translation>Mottat:</translation>
+    </message>
+    <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="257"/>
+        <source>Sent: </source>
+        <translation>Sendt:</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>Vidalia Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="449"/>
+        <source>Find Previous</source>
+        <translation>Finn Forrige</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="462"/>
+        <source>Find Next</source>
+        <translation>Finn Neste</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="496"/>
+        <source>Case sensitive</source>
+        <translation>Skill mellom store og smÃ bokstaver</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="535"/>
+        <source>Contents</source>
+        <translation>Innhold</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="580"/>
+        <source>Help Topics</source>
+        <translation>Hjelpe-emner</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="625"/>
+        <source>Search</source>
+        <translation>SÃk</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="680"/>
+        <source>Found Documents</source>
+        <translation>Dokumenter Funnet </translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="759"/>
+        <source>Back</source>
+        <translation>Tilbake</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="762"/>
+        <source>Move to previous page (Backspace)</source>
+        <translation>GÃ til forrige side (Rettetast)</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>Fremover</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="781"/>
+        <source>Move to next page (Shift+Backspace)</source>
+        <translation>GÃ til neste side (Shift+Backspace)</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="789"/>
+        <source>Shift+Backspace</source>
+        <translation>operasjon</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="797"/>
+        <source>Home</source>
+        <translation>Hjem</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="800"/>
+        <source>Move to the Home page (Ctrl+H)</source>
+        <translation>Flytt til Hjem-siden (Ctrl+H)</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="808"/>
+        <source>Ctrl+H</source>
+        <translation>Ctrl+H</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="825"/>
+        <source>Find</source>
+        <translation>Finn</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>SÃk etter ord eller streng pÃ denne siden (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>Lukk</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="847"/>
+        <source>Close Vidalia Help</source>
+        <translation>Lukk Vidalia Hjelp</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>Feil ved henging av Hjelp-Innhold </translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="372"/>
+        <source>Search reached end of document</source>
+        <translation>SÃket nÃdde slutten av dokumentet</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="374"/>
+        <source>Search reached start of document</source>
+        <translation>SÃket nÃdde begynnelsen av dokumentet</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="376"/>
+        <source>Text not found in document</source>
+        <translation>Fant ikke teksten i dokumentet</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="427"/>
+        <source>Find:</source>
+        <translation>Finn:</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="506"/>
+        <source>Whole words only</source>
+        <translation>Kun hele ord</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="637"/>
+        <source>Searching for:</source>
+        <translation>SÃker etter:</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="133"/>
+        <source>Supplied XML file is not a valid Contents document.</source>
+        <translation>Den oppgitte XML-filen er ikke ett dokument med gyldig innhold.</translation>
+    </message>
+    <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="421"/>
+        <source>Found %1 results</source>
+        <translation>Fant %1 resultater</translation>
+    </message>
+</context>
+<context>
+    <name>HelpTextBrowser</name>
+    <message>
+        <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
+        <source>Error opening help file: </source>
+        <translation>Feil ved Ãpning av hjelpe-fil:</translation>
+    </message>
+</context>
+<context>
+    <name>LogEvent</name>
+    <message>
+        <location filename="../control/logevent.cpp" line="68"/>
+        <source>Debug</source>
+        <translation>Avlus</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="69"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="70"/>
+        <source>Notice</source>
+        <translation>Merknad</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="71"/>
+        <source>Warning</source>
+        <translation>Advarsel</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="72"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="../control/logevent.cpp" line="73"/>
+        <source>Unknown</source>
+        <translation>Ukjent</translation>
+    </message>
+</context>
+<context>
+    <name>LogTreeWidget</name>
+    <message>
+        <location filename="../gui/log/logtreewidget.cpp" line="40"/>
+        <source>Messages Shown: </source>
+        <translation>Meldinger Vist:</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
+        <source>Messages Shown: %1</source>
+        <translation>Meldinger Vist: %1</translation>
+    </message>
+</context>
+<context>
+    <name>MainWindow</name>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="674"/>
+        <source>About</source>
+        <translation>Om</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="687"/>
+        <source>Exit</source>
+        <translation>Avslutt</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="548"/>
+        <source>Bandwidth Graph</source>
+        <translation>BÃndbredde Graf</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="561"/>
+        <source>Message Log</source>
+        <translation>Meldingslogg</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="611"/>
+        <source>Help</source>
+        <translation>Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
+        <source>Ctrl+T</source>
+        <translation>Ctrl+T</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
+        <source>Ctrl+B</source>
+        <translation>Ctrl+B</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
+        <source>Ctrl+L</source>
+        <translation>Ctrl+L</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
+        <source>Ctrl+?</source>
+        <translation>Ctrl+?</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
+        <source>File</source>
+        <translation>Fil</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
+        <source>Tor</source>
+        <translation>Tor </translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
+        <source>View</source>
+        <translation>Vis</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
+        <source>Vidalia Help</source>
+        <translation>Vidalia Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
+        <source>Error Starting Tor</source>
+        <translation>Feil ved oppstart av Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
+        <source>Error Connecting to Tor</source>
+        <translation>Feil ved tilknytning til Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
+        <source>Error Stopping Tor</source>
+        <translation>Feil ved Stopping av Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
+        <source>Tor Exited</source>
+        <translation>Tor Avsluttet</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
+        <source>Vidalia was unable to stop Tor.</source>
+        <translation>Vidalia klarte ikke Ã avslutte Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
+        <source>Tor is running</source>
+        <translation>Tor kjÃrer</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
+        <source>Server is Enabled</source>
+        <translation>Tjeneren er tilkoblet</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
+        <source>Ctrl+N</source>
+        <translation>Ctrl+N</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
+        <source>Error Applying Server Settings</source>
+        <translation>Feil ved pÃlegging av Tjener-Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
+        <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="574"/>
+        <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>Du kjÃrer allered en Tor-tjener. Hvis du avslutter din tjener vil det bryte dine Ãpne forbindelser fra klienter. 
+
+Vil du stenge ned gradvis og gi dine klienter tid til Ã finne en ny tjener?</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
+        <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 oppdaget at Tor plutselig og uventet avsluttet.
+
+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="506"/>
+        <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="257"/>
+        <source>Network Map</source>
+        <translation>Nettverkskart</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="624"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
+        <source>New Identity</source>
+        <translation>Ny Identitet </translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
+        <source>Ctrl+I</source>
+        <translation>Ctrl+I</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
+        <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="741"/>
+        <source>Failed to Create New Identity</source>
+        <translation>Kunne ikke lage Ny Identitet</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="477"/>
+        <source>Start Tor</source>
+        <translation>Start Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="390"/>
+        <source>Tor is not running</source>
+        <translation>Tor kjÃrer ikke</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
+        <source>Tor is shutting down</source>
+        <translation>Tor stenger ned</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
+        <source>Stop Tor</source>
+        <translation>Stopp Tor</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
+        <source>Tor is starting up</source>
+        <translation>Tor starter opp</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="298"/>
+        <source>Vidalia Control Panel</source>
+        <translation>Vidalias Kontrollpanel</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="328"/>
+        <source>Tor Status</source>
+        <translation>Tor Status</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="453"/>
+        <source>Vidalia Shortcuts</source>
+        <translation>Vidalia Snareveier</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="487"/>
+        <source>Setup Relaying</source>
+        <translation>Konfigurer Formidling</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="490"/>
+        <source>Set up a Tor relay and help the network grow</source>
+        <translation>KjÃr en Tor mellommann og hjelp nettverket vokse</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="500"/>
+        <source>View the Network</source>
+        <translation>Vis Nettverket</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="503"/>
+        <source>View a map of the Tor network</source>
+        <translation>Vis kart over Tor-nettverket</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="516"/>
+        <source>Use a New Identity</source>
+        <translation>Bruk Ny Identitet</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="519"/>
+        <source>Make subsequent connections appear new</source>
+        <translation>GjÃr at pÃgÃende forbindelser ser ut som nye</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="551"/>
+        <source>View Tor&apos;s bandwidth usage</source>
+        <translation>Vis Tors bÃndbreddebruk</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="564"/>
+        <source>View Tor&apos;s log message history</source>
+        <translation>Vis historikken for Tor sin meldingslogg</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="614"/>
+        <source>View help documentation</source>
+        <translation>Vis hjelpetekstene</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="627"/>
+        <source>Configure Tor and Vidalia</source>
+        <translation>Konfigurer Tor og Vidalia</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="677"/>
+        <source>View version and license information</source>
+        <translation>Vis versjon og lisens informasjon</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="690"/>
+        <source>Exit Vidalia</source>
+        <translation>Avslutt Vidalia</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="743"/>
+        <source>Show this window on startup</source>
+        <translation>Vis dette vinduet ved oppstart</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="762"/>
+        <source>Hide</source>
+        <translation>Skjul</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.ui" line="765"/>
+        <source>Hide this window</source>
+        <translation>Skjul dette vinduet</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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>Meldings Logg</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="336"/>
+        <source>Time</source>
+        <translation>Tid</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="341"/>
+        <source>Type</source>
+        <translation>Type</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="346"/>
+        <source>Message</source>
+        <translation>Melding</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="646"/>
+        <source>Browse</source>
+        <translation>Bla</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="430"/>
+        <source>Saves the current Message Log settings</source>
+        <translation>Lagr de nÃvÃrende innstillingene for Meldingloggen</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="433"/>
+        <source>Save Settings</source>
+        <translation>Lagr Inntillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="449"/>
+        <source>Cancels changes made to settings</source>
+        <translation>Avbryter endring av innstillingene</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="452"/>
+        <source>Cancel</source>
+        <translation>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="466"/>
+        <source>Message Filter</source>
+        <translation>Meldings FIlter</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="487"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="503"/>
+        <source>Warning</source>
+        <translation>Advarsel</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="519"/>
+        <source>Notice</source>
+        <translation>Merknad</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="535"/>
+        <source>Info</source>
+        <translation>Info</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="551"/>
+        <source>Debug</source>
+        <translation>Avlus</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="727"/>
+        <source>Message Filters...</source>
+        <translation>Meldingsfilter</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="730"/>
+        <source>Set message filters</source>
+        <translation>Skru pÃ meldingsfiltrering</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="743"/>
+        <source>History Size...</source>
+        <translation>Historikk StÃrrelse...</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="746"/>
+        <source>Set maximum number of messages to display</source>
+        <translation>Set maksimum antall meldinger som vises</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="762"/>
+        <source>Clear</source>
+        <translation>TÃm</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="765"/>
+        <source>Clear all messages from the Message Log (Ctrl+E)</source>
+        <translation>TÃm alle meldinger fra Meldingslogge (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>Kopier</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="790"/>
+        <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
+        <translation>Kopier valgte meldinger til utklippstavlen (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>Velg alt</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="812"/>
+        <source>Select all messages (Ctrl+A)</source>
+        <translation>Velg alle meldinger (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>Lagr Alt</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="831"/>
+        <source>Save all messages to a file</source>
+        <translation>Lagr alle meldinger til en fil</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="844"/>
+        <source>Save Selected</source>
+        <translation>Lagr merket</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="847"/>
+        <source>Save selected messages to a file</source>
+        <translation>Lagr valgte meldinger i en fil</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="901"/>
+        <source>Close</source>
+        <translation>Lukk</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="904"/>
+        <source>Close the Message Log</source>
+        <translation>Lukk Meldingsloggen</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>Finn </translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="926"/>
+        <source>Find all messages containing the search text (Ctrl+F)</source>
+        <translation>Finn alle meldinger som inneholder sÃketeksten (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>Meldinger som vises om noe har gÃtt veldig galt og Tor ikke kan fortsette.</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>Meldinger som kun vises nÃr noe har gÃtt galt med Tor.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="154"/>
+        <source>Messages that appear infrequently 
+during normal Tor operation and are 
+not considered errors, but you may 
+care about.</source>
+        <translation>Meldinger som sjelden vises ved normal Tor-aktivitet og som ikke regnes som feil men likevel kan vÃre av interesse.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="156"/>
+        <source>Messages that appear frequently 
+during normal Tor operation.</source>
+        <translation>Meldinger som stadig vises ved vanlig Tor-aktivitet.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="158"/>
+        <source>Hyper-verbose messages primarily of 
+interest to Tor developers.</source>
+        <translation>Ekstra-detaljerte meldinger er primÃrt nyttig for Tor-utviklere.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="203"/>
+        <source>Error Setting Filter</source>
+        <translation>Feilet ved setting av Filter</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="219"/>
+        <source>Error Opening Log File</source>
+        <translation>Feil ved Ãpning av Logg-Fil</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="294"/>
+        <source>Select Log File</source>
+        <translation>Velg Logg-fil</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="311"/>
+        <source>Save Log Messages</source>
+        <translation>Lagr Logg-meldinger</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>Fin i Meldingsloggen</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="377"/>
+        <source>Find:</source>
+        <translation>Finn:</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="383"/>
+        <source>Not Found</source>
+        <translation>Ikke Funnet</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="384"/>
+        <source>Search found 0 matches.</source>
+        <translation>SÃket ga 0 resultater.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="863"/>
+        <source>Settings</source>
+        <translation>Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="866"/>
+        <source>Adjust Message Log Settings</source>
+        <translation>Tilpass Innstillinger for Meldingloggen</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>Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="885"/>
+        <source>Show the help browser</source>
+        <translation>Vis hjelp-leseren</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 klarte ikke hente ut Tors logg-hendelser.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="324"/>
+        <source>Cannot write file %1
+
+%2.</source>
+        <translation>Kunne ikke skrive fil %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 kunne ikke Ã Ãpne spesifisert logg-fil.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.cpp" line="314"/>
+        <source>Text Files (*.txt)</source>
+        <translation>Tekst Filer (*.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>Logg-Filnavn PÃkrevd</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>Du mÃ oppgi ett filnavn for Ã kunne lagre meldingsloggen til en fil.</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="567"/>
+        <source>Message Log History</source>
+        <translation>Meldingshistorikk</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="588"/>
+        <source>Number of messages to display in the message log window</source>
+        <translation>Antall meldinger som vises i meldingsvinduet</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="612"/>
+        <source>messages</source>
+        <translation>meldinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="631"/>
+        <source>Always Save New Log Messages</source>
+        <translation>Lagr alltid nye Logg-meldinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="669"/>
+        <source>Enable automatically saving all new log messages to a file</source>
+        <translation>Skru pÃ automatisk lagring av alle nye logg-meldinger til en fil</translation>
+    </message>
+    <message>
+        <location filename="../gui/log/messagelog.ui" line="672"/>
+        <source>Automatically save new log messages to a file</source>
+        <translation>Lagr automatisk nye logg-meldinger til en fil</translation>
+    </message>
+</context>
+<context>
+    <name>NetViewer</name>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="297"/>
+        <source>View Tor Network</source>
+        <translation>Vis Tor-Nettverket</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="518"/>
+        <source>Refresh</source>
+        <translation>Oppdater</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="540"/>
+        <source>Help</source>
+        <translation>Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="562"/>
+        <source>Close</source>
+        <translation>Lukk</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="584"/>
+        <source>Zoom In</source>
+        <translation>Zoom Inn</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="606"/>
+        <source>Zoom Out</source>
+        <translation>Zoom Ut</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="524"/>
+        <source>Refresh the list of routers and connections</source>
+        <translation>Oppdater listen over routere og forbindelser</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="546"/>
+        <source>Show the network map help</source>
+        <translation>Vis hjelpeteksten for nettverkskartet</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="568"/>
+        <source>Close the network map</source>
+        <translation>Lukk nettverks-kartet</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="590"/>
+        <source>Zoom in on the network map</source>
+        <translation>Zoom inn pÃ nettverks-kartet</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="612"/>
+        <source>Zoom out on the network map</source>
+        <translation>Zoom ut pÃ nettverks-kartet</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="628"/>
+        <source>Zoom To Fit</source>
+        <translation>Zoom til Ã passe</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="634"/>
+        <source>Zooms to fit all currently displayed circuits</source>
+        <translation>Zoomer slik at det passer alle viste forbindelser</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>
+    <message>
+        <location filename="../gui/network/netviewer.ui" line="543"/>
+        <source>Show network map help</source>
+        <translation>Vis hjelpetekst for nettverks-kartet</translation>
+    </message>
+</context>
+<context>
+    <name>Policy</name>
+    <message>
+        <location filename="../config/policy.cpp" line="178"/>
+        <source>accept</source>
+        <translation>aksepter</translation>
+    </message>
+    <message>
+        <location filename="../config/policy.cpp" line="178"/>
+        <source>reject</source>
+        <translation>nekt</translation>
+    </message>
+</context>
+<context>
+    <name>RouterDescriptor</name>
+    <message>
+        <location filename="../control/routerdescriptor.cpp" line="87"/>
+        <source>Online</source>
+        <translation>Tilkoblet</translation>
+    </message>
+    <message>
+        <location filename="../control/routerdescriptor.cpp" line="89"/>
+        <source>Hibernating</source>
+        <translation>Sover</translation>
+    </message>
+    <message>
+        <location filename="../control/routerdescriptor.cpp" line="91"/>
+        <source>Offline</source>
+        <translation>Frakoblet</translation>
+    </message>
+</context>
+<context>
+    <name>RouterDescriptorView</name>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
+        <source>IP Address:</source>
+        <translation>IP Adresse:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
+        <source>Platform:</source>
+        <translation>Plattform:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
+        <source>Bandwidth:</source>
+        <translation>BÃndbredde:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
+        <source>Uptime:</source>
+        <translation>Oppetid:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
+        <source>Last Updated:</source>
+        <translation>Sist Oppdatert:</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
+        <source>Location:</source>
+        <translation>Sted:</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>Frakoblet</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerlistitem.cpp" line="82"/>
+        <source>Hibernating</source>
+        <translation>Sover</translation>
+    </message>
+</context>
+<context>
+    <name>RouterListWidget</name>
+    <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
+        <source>Server</source>
+        <translation>Tjener</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
+        <source>Zoom to Server</source>
+        <translation>Zoom til Tjener</translation>
+    </message>
+    <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
+        <source>%1 servers online (%2 total)</source>
+        <translation>%1 aktive tjenere (%2 totalt)</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>Kryss av for Ã kjÃre Tor som en tjener</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="505"/>
+        <source>Relay traffic for the Tor network</source>
+        <translation>Videresend trafikk for Tor-nettverket</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="716"/>
+        <source>Directory Port:</source>
+        <translation>Katalog Port:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="746"/>
+        <source>Directory Port Number</source>
+        <translation>Katalog Port Nummer</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="616"/>
+        <source>Nickname:</source>
+        <translation>Kallenavn:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="821"/>
+        <source>Name of your server</source>
+        <translation>Navnet pÃ tjeneren din</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="684"/>
+        <source>Contact Info:</source>
+        <translation>Kontakt Info:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="638"/>
+        <source>Server Port:</source>
+        <translation>Tjener Port:</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>Porten som brukere og tjenere kan bruke til Ã kommunisere med din tjener</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="565"/>
+        <source>Address:</source>
+        <translation>Adresse:</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="781"/>
+        <source>Domain name or IP address of your server</source>
+        <translation>Domenenavn eller IP-adressen til tjeneren din</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="837"/>
+        <source>Enable to mirror the server directory</source>
+        <translation>SKru pÃ for Ã speile tjener-katalogen</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="840"/>
+        <source>Mirror the Server Directory </source>
+        <translation>Spil Tjener-katalogen</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="590"/>
+        <source>Attempts to determine the correct address for your server</source>
+        <translation>ForsÃker Ã finne ut den riktige adressen for tjeneren din</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="593"/>
+        <source>Get Address</source>
+        <translation>Hent Adresse</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1251"/>
+        <source>Exit Policies</source>
+        <translation>Utgangs-Politikk</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1377"/>
+        <source>Show help topic on exit policies</source>
+        <translation>Vis hjelpeteksten for tillatte utgÃende forbindelser</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.cpp" line="148"/>
+        <source>You must specify at least a server nickname and port.</source>
+        <translation>Du mÃ minimum oppgi tjenerens kallenavn og port</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.cpp" line="232"/>
+        <source>Error</source>
+        <translation>Feil</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.cpp" line="233"/>
+        <source>Vidalia was unable to determine your public IP address.</source>
+        <translation>
+Vidalia klarte ikke Ã finne ut hvilken IP-adresse du har.</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 klarte bare finne den private IP-adressen til tjeneren din. 
+
+Vil du bruke en ekstern tjeneste for Ã finne ut din offentlige IP-adresse?</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>Hvis denne funksjonen er skrudd pÃ vil Vidalia periodisk oppdatere IP-adressen din om det er nÃdvendig</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="853"/>
+        <source>Automatically Update</source>
+        <translation>Oppdater Automatisk</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>E-post adresse hvor det er mulig Ã fÃ tak i deg hvis tjeneren din sliter. Du kan ogsÃ inkludere ditt PGP eller GPG fingeravtrykk.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1107"/>
+        <source>Long-term average bandwidth limit</source>
+        <translation>Gjennomsnittlig langvarig bÃndbredde-begensning</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1078"/>
+        <source>Average Rate</source>
+        <translation>Gjennomsnittshastighet</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>Begrensning for kortvarige bÃnbredde-topper</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1153"/>
+        <source>Maximum Rate</source>
+        <translation>Maksimal Hastighet</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="989"/>
+        <source>Show help topic on bandwidth rate limits</source>
+        <translation>Hvis hjelpeteksten for bÃndbredde-begrensning</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="537"/>
+        <source>Basic Settings</source>
+        <translation>Grunnleggende Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="887"/>
+        <source>Bandwidth Limits</source>
+        <translation>BÃndbredde Begrensinger</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>Vennligst oppgi din opplastningshastighet her hvis du har rask nedlastningshastighet med treg opplastningshastighet.</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="943"/>
+        <source>Select the entry that most closely resembles your Internet connection</source>
+        <translation>Velg det som best reflekterer Internett-forbindelsen din</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="953"/>
+        <source>Cable/DSL 256 Kbps</source>
+        <translation>Kabel/DSL 256 Kbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="958"/>
+        <source>Cable/DSL 512 Kbps</source>
+        <translation>Kabel/DSL 512 Kbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="963"/>
+        <source>Cable/DSL 768 Kbps</source>
+        <translation>Kabel/DSL 768 Kbps</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="968"/>
+        <source>T1/Cable/DSL 1.5 Mbps</source>
+        <translation>T1/Kabel/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>Egendefinert</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1289"/>
+        <source>Ports 6660 - 6669 and 6697</source>
+        <translation>Port 6660 - 6669 og 6697</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1292"/>
+        <source>Internet Relay Chat (IRC)</source>
+        <translation>Internett Relay Chat (IRC)</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1302"/>
+        <source>Ports 110, 143, 993 and 995</source>
+        <translation>Port 110, 143, 993 og 995</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1305"/>
+        <source>Retrieve Mail (POP, IMAP)</source>
+        <translation>Motta E-Post (POP, IMAP)</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1315"/>
+        <source>Ports unspecified by other checkboxes</source>
+        <translation>Porter ikke angitt i andre avkryssningsbokser</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1318"/>
+        <source>Misc Other Services</source>
+        <translation>Diverse Andre Tjenester</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1328"/>
+        <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
+        <translation>Port 706, 1863, 5050, 5190, 5222, 8300 og 8888</translation>
+    </message>
+    <message>
+        <location filename="../gui/config/serverpage.ui" line="1331"/>
+        <source>Instant Messaging (IM)</source>
+        <translation>Bruker-Til-Bruker meldinger (IM)</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>Sikre Nettsider (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>Nettsider</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>Hvilke Internett-ressursjer skal Tor-brukere fÃ lov Ã benytte fra din Tor-tjener?</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>Din maksimale bÃndbredde-grense mÃ vÃre stÃrre enn eller lik din gjennomsnittsgrense. Begge verdiene mÃ vÃre minst 20 KB/s.</translation>
+    </message>
+</context>
+<context>
+    <name>Stream</name>
+    <message>
+        <location filename="../control/stream.cpp" line="110"/>
+        <source>New</source>
+        <translation>Ny</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="112"/>
+        <source>Resolving</source>
+        <translation>SlÃr opp</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="113"/>
+        <source>Connecting</source>
+        <translation>Tilknytter</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="114"/>
+        <source>Open</source>
+        <translation>Ãpen</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="115"/>
+        <source>Failed</source>
+        <translation>Feilet</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="116"/>
+        <source>Closed</source>
+        <translation>Lukket</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="118"/>
+        <source>Unknown</source>
+        <translation>Ukjent</translation>
+    </message>
+    <message>
+        <location filename="../control/stream.cpp" line="117"/>
+        <source>Retrying</source>
+        <translation>PrÃver igjen</translation>
+    </message>
+</context>
+<context>
+    <name>TorProcess</name>
+    <message>
+        <location filename="../control/torprocess.cpp" line="93"/>
+        <source>Process %1 failed to stop. [%2]</source>
+        <translation>Prosess %1 nektet Ã stoppe. [%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>Tor tjenesten er ikke installert</translation>
+    </message>
+    <message>
+        <location filename="../control/torservice.cpp" line="173"/>
+        <source>Unable to start the Tor service.</source>
+        <translation>Kunne ikke starte Tor-tjeneren.</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>Avbryt</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="90"/>
+        <source>Yes</source>
+        <translation>Ja</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="91"/>
+        <source>No</source>
+        <translation>Nei</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="92"/>
+        <source>Help</source>
+        <translation>Hjelp</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="93"/>
+        <source>Retry</source>
+        <translation>PrÃv igjen</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="94"/>
+        <source>Show Log</source>
+        <translation>Vis Logg</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="95"/>
+        <source>Show Settings</source>
+        <translation>Vis Innstillinger</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="96"/>
+        <source>Continue</source>
+        <translation>Fortsett</translation>
+    </message>
+    <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="97"/>
+        <source>Quit</source>
+        <translation>Avslutt</translation>
+    </message>
+</context>
+<context>
+    <name>Vidalia</name>
+    <message>
+        <location filename="../vidalia.cpp" line="230"/>
+        <source>Invalid language code specified: </source>
+        <translation>Ugyldig sprÃk-kode spesifisert: </translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="237"/>
+        <source>Invalid GUI style specified: </source>
+        <translation>Ugyldig GUI-stil spesifisert:</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="86"/>
+        <source>Vidalia is already running</source>
+        <translation>Vidalia kjÃrer allerede</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>Vidalia oppdaget en annen Vidalia-prosess og bÃr derfor ikke startes. Hvis dette er feil kan du likevel starte Vidalia. 
+
+Vil du fortsette og starte Vidalia?</translation>
+    </message>
+    <message>
+        <location filename="../main.cpp" line="72"/>
+        <source>Invalid Argument</source>
+        <translation>Ugyldig Argument</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="161"/>
+        <source>Displays this usage message and exits.</source>
+        <translation>Viser denne brukesmeldingen og avslutter.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="163"/>
+        <source>Resets ALL stored Vidalia settings.</source>
+        <translation>Tilbakestill ALLE *lagrede* innstillinger for Vidalia.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="165"/>
+        <source>Sets the directory Vidalia uses for data files.</source>
+        <translation>Velger mappen Vidalia bruker for sine datafiler.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="167"/>
+        <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
+        <translation>Gir navn og plassering av Vidalia sin pid-fil.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="169"/>
+        <source>Sets the name and location of Vidalia&apos;s logfile.</source>
+        <translation>Gir navn og plassering av Vidalia sin loggfil.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="172"/>
+        <source>Sets the verbosity of Vidalia&apos;s logging.</source>
+        <translation>Velger mengden informasjon Vidalia logger.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="175"/>
+        <source>Sets Vidalia&apos;s interface style.</source>
+        <translation>Velger stil for Vidalia sitt brukergrensesnitt.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="178"/>
+        <source>Sets Vidalia&apos;s language.</source>
+        <translation>Velger Vidalia sitt sprÃk.</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="182"/>
+        <source>Vidalia Usage Information</source>
+        <translation>Vidalia Bruksinformasjon</translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="243"/>
+        <source>Invalid log level specified: </source>
+        <translation>Ugyldig loggnivÃ valgt: </translation>
+    </message>
+    <message>
+        <location filename="../vidalia.cpp" line="249"/>
+        <source>Unable to open log file &apos;%1&apos;: %2</source>
+        <translation>Kunne ikke Ãpne loggfil &apos;%1&apos;: %2</translation>
+    </message>
+</context>
+</TS>

Modified: trunk/src/lang/vidalia_nl.ts
===================================================================
--- trunk/src/lang/vidalia_nl.ts	2007-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_nl.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -185,7 +185,7 @@
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="80"/>
         <source>&apos;%1&apos; is not a valid IP address.</source>
-	<translation>&apos;%1&apos; is geen geldig IP adres.</translation>
+        <translation>&apos;%1&apos; is geen geldig IP adres.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="542"/>
@@ -426,7 +426,7 @@
     <message>
         <location filename="../control/controlconnection.cpp" line="239"/>
         <source>Control socket is not connected</source>
-	<translation>Control socket is niet verbonden.</translation>
+        <translation>Control socket is niet verbonden.</translation>
     </message>
 </context>
 <context>
@@ -459,7 +459,7 @@
     <message>
         <location filename="../control/controlsocket.cpp" line="150"/>
         <source>Control socket is not connected.</source>
-	<translation>Control socket is niet verbonden.</translation>
+        <translation>Control socket is niet verbonden.</translation>
     </message>
     <message>
         <location filename="../control/controlsocket.cpp" line="81"/>
@@ -777,7 +777,7 @@
         <translation>Berichten Weergegeven: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Berichten Weergegeven: %1</translation>
     </message>
@@ -800,27 +800,27 @@
         <translation type="obsolete">Stop</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Over</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>Sluiten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>Bandbreedte Grafiek</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Berichten Logboek</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Help</translation>
     </message>
@@ -830,57 +830,57 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>Bestand</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>Bekijk</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Vidalia Help</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Fout bij Starten Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Fout bij Verbinden met Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Fout bij Stoppen Tor</translation>
     </message>
@@ -890,12 +890,12 @@
         <translation type="obsolete">Tor is gestopt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor is Afgesloten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia was niet in staat Tor te stoppen.</translation>
     </message>
@@ -905,12 +905,12 @@
         <translation type="obsolete">Tor is aan het starten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor is actief</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>Server is Ingeschakeld</translation>
     </message>
@@ -920,22 +920,22 @@
         <translation type="obsolete">Tor is aan het stoppen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Fout bij Toepassen Server Instellingen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -953,155 +953,176 @@
 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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Netwerk Kaart</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>Instellingen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Nieuwe Identiteit</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
-        <translation>Cre&euml;ren van Nieuwe Identiteit Mislukt</translation>
+        <translation>Creren van Nieuwe Identiteit Mislukt</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation>Start Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation>Tor is niet actief.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation>Tor is bezig met afsluiten.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation>Stop Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation>Tor is aan het opstarten.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation>Vidalia Configuratiescherm</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation>Tor Status</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation>Vidalia Snelkoppeling</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation>Relaying Instellen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <source>Set up a Tor relay and help the network grow</source>
         <translation>Zet een Tor relay op en help het netwerk groeien</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="182"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation>Bekijk het Netwerk</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation>Bekijk een kaart van het Tor netwerk</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation>Gebruik een Nieuwe Identiteit</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation>Laat de eerstvolgende verbindingen nieuw lijken</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation>Bekijk Tor&apos;s bandbreedte gebruik</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
-	<translation>Bekijk Tor&apos;s berichten logboek geschiedenis</translation>
+        <translation>Bekijk Tor&apos;s berichten logboek geschiedenis</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation>Bekijk de help documentatie</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation>Configureer Tor en Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation>Bekijk versie en licentie informatie</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation>Vidalia afsluiten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation>Toon dit scherm bij het opstarten</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation>Verbergen</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation>Dit scherm niet tonen</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>
@@ -1218,12 +1239,12 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="787"/>
         <source>Copy</source>
-        <translation>Kopi&euml;ren</translation>
+        <translation>Kopiren</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="790"/>
         <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
-        <translation>Kopie&euml;r de geselecteerde berichten naar het klembord (Ctrl+C)</translation>
+        <translation>Kopier de geselecteerde berichten naar het klembord (Ctrl+C)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="798"/>
@@ -1675,7 +1696,7 @@
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
         <source>%1 servers online (%2 total)</source>
-	<translation>%1 servers online (%2 totaal)</translation>
+        <translation>%1 servers online (%2 totaal)</translation>
     </message>
 </context>
 <context>
@@ -1785,7 +1806,7 @@
         <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 was enkel in staat een priv&eacute; IP adres te vinden voor uw server.
+        <translation>Vidalia was enkel in staat een priv IP adres te vinden voor uw server.
 
 Wilt u een externe service benaderen om uw publieke IP adres te achterhalen?</translation>
     </message>
@@ -2015,7 +2036,7 @@
     <message>
         <location filename="../control/torservice.cpp" line="155"/>
         <source>The Tor service is not installed.</source>
-        <translation>De Tor service is niet ge&iuml;nstalleerd.</translation>
+        <translation>De Tor service is niet genstalleerd.</translation>
     </message>
     <message>
         <location filename="../control/torservice.cpp" line="173"/>
@@ -2125,27 +2146,27 @@
     <message>
         <location filename="../vidalia.cpp" line="167"/>
         <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
-	<translation>Stelt de naam en locatie in van Vidalia&apos;s pid-bestand.</translation>
+        <translation>Stelt de naam en locatie in van Vidalia&apos;s pid-bestand.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="169"/>
         <source>Sets the name and location of Vidalia&apos;s logfile.</source>
-	<translation>Stelt de naam en locatie in van Vidalia&apos;s logbestand.</translation>
+        <translation>Stelt de naam en locatie in van Vidalia&apos;s logbestand.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="172"/>
         <source>Sets the verbosity of Vidalia&apos;s logging.</source>
-	<translation>Stelt de uitgebreidheid in van Vidalia&apos;s loggedrag.</translation>
+        <translation>Stelt de uitgebreidheid in van Vidalia&apos;s loggedrag.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="175"/>
         <source>Sets Vidalia&apos;s interface style.</source>
-	<translation>Stelt Vidalia&apos;s uiterlijke stijl in.</translation>
+        <translation>Stelt Vidalia&apos;s uiterlijke stijl in.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="178"/>
         <source>Sets Vidalia&apos;s language.</source>
-	<translation>Stelt Vidalia&apos;s taal in.</translation>
+        <translation>Stelt Vidalia&apos;s taal in.</translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="182"/>
@@ -2160,7 +2181,7 @@
     <message>
         <location filename="../vidalia.cpp" line="249"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
-	<translation>Openen mislukt van log bestand &apos;%1&apos;: %2</translation>
+        <translation>Openen mislukt van log bestand &apos;%1&apos;: %2</translation>
     </message>
 </context>
 </TS>

Modified: trunk/src/lang/vidalia_pl.ts
===================================================================
--- trunk/src/lang/vidalia_pl.ts	2007-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_pl.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -776,7 +776,7 @@
         <translation>WiadomoÅci:</translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>WiadomoÅci: %1</translation>
     </message>
@@ -799,27 +799,27 @@
         <translation type="obsolete">Zatrzymaj</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Informacje</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>WyjdÅ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>ZuÅycie ÅÄcza</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Dziennik LogÃw</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Pomoc</translation>
     </message>
@@ -829,57 +829,57 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>Plik</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>Widok</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Pomoc Vidalii</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>BÅÄd uruchamiania Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>BÅÄd podÅÄczenia do Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>BÅad zatrzymywania Tora</translation>
     </message>
@@ -889,12 +889,12 @@
         <translation type="obsolete">Tor jest zatrzymany</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor wyÅÄczony</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia nie mogÅa zatrzymaÄ Tora</translation>
     </message>
@@ -904,12 +904,12 @@
         <translation type="obsolete">Uruchamianie Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor aktywny</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>Serwer uaktywniony</translation>
     </message>
@@ -919,22 +919,22 @@
         <translation type="obsolete">Zatrzymywanie Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Aktualizacja ustawieÅ serwera nie powiodÅa siÄ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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 @@
 Czy chciaÅbyÅ dokonaÄ tego elegancko, dajÄc klientom czas na znalezienie nowego serwera?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -952,155 +952,176 @@
 ProszÄ sprawdziÄ Dziennik LogÃw, aby zidentyfikowaÄ przyczynÄ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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Ä Tora. ProszÄ sprawdziÄ ustawienia, aby upewniÄ siÄ co do ÅcieÅki dostÄpu do pliku wykonywalnego Tora.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Mapa Sieci</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>Ustawienia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Nowa ToÅsamoÅÄ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation>Uruchom Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation>Tor nie jest uruchomiony</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation>Zamykanie Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation>Zatrzymaj Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation>Uruchamianie Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation>Panel Kontrolny Vidalii</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation>Status Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation>SkrÃty Vidalii</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation>Ustawienia serwera</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <source>Set up a Tor relay and help the network grow</source>
         <translation>Ustaw serwer i pomÃÅ sieci w ekspansji</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="182"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation>PokaÅ SieÄ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation>PokaÅ mapÄ sieci Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation>UÅyj Nowej ToÅsamoÅci</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation>UczyÅ kolejne poÅÄczenia jako nowe</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation>PokaÅ wykorzystanie ÅÄcza przez Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation>PokaÅ historiÄ logÃw Tora</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation>PokaÅ dokumentacjÄ pomocy</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation>Konfiguruj Tora i VidaliÄ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation>PokaÅ informacjÄ o wersji i licencji</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation>Zamknij VidaliÄ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation>Pokazuj to okno na starcie</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation>Ukryj</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation>Ukryj to okno</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>

Modified: trunk/src/lang/vidalia_pt.ts
===================================================================
--- trunk/src/lang/vidalia_pt.ts	2007-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_pt.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -776,7 +776,7 @@
         <translation>Mensagens Mostradas: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>Mensagens Mostradas: %1</translation>
     </message>
@@ -794,27 +794,27 @@
         <translation type="obsolete">Parar</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Sobre</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>Sair</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>GrÃfico de Largura de Banda</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>Log de Mensagens</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>Ajuda</translation>
     </message>
@@ -824,92 +824,92 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>Arquivo</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>Visualizar</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Ajuda do Vidalia</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>Erro ao Iniciar o Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>Erro ao Conectar ao Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>Erro ao Parar o Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor Finalizado</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <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="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>O Servidor estÃ habilitado</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>Erro ao Aplicar as ConfiguraÃÃes ao Servidor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <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="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -927,37 +927,37 @@
 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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>Mapa da Rede</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>ConfiguraÃÃes</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>Nova Identidade</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <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="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>Falha ao Criar Nova Identidade</translation>
     </message>
@@ -982,125 +982,146 @@
         <translation type="obsolete">O Tor parou</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>O Tor estÃ em execuÃÃo</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_ru.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -1,7 +1,9 @@
-<!DOCTYPE TS><TS>
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE TS><TS version="1.1">
 <context>
     <name></name>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="33"/>
         <source>Arial</source>
         <translation>Arial</translation>
     </message>
@@ -9,38 +11,47 @@
 <context>
     <name>AboutDialog</name>
     <message>
+        <location filename="../gui/about/aboutdialog.ui" line="290"/>
         <source>About Vidalia</source>
         <translation>Ð ÐÑÐÐÑÐÐÐÐ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.ui" line="344"/>
         <source>Vidalia</source>
         <translation>Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.ui" line="512"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.ui" line="428"/>
         <source>Qt</source>
         <translation>Qt</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.ui" line="443"/>
         <source>Qt Version</source>
         <translation>ÐÐÑÑÐÑ Qt</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.ui" line="528"/>
         <source>Tor Version</source>
         <translation>ÐÐÑÑÐÑ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.ui" line="359"/>
         <source>Vidalia Version</source>
         <translation>ÐÐÑÑÐÑ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.cpp" line="79"/>
         <source>&lt;Not Running&gt;</source>
         <translation>&lt;ÐÐ ÐÐÐÑÑÐÐ&gt;</translation>
     </message>
     <message>
+        <location filename="../gui/about/aboutdialog.cpp" line="75"/>
         <source>&lt;Unavailable&gt;</source>
         <translation>&lt;ÐÐÐÐÐÐÑÑÐÐ&gt;</translation>
     </message>
@@ -48,90 +59,112 @@
 <context>
     <name>AdvancedPage</name>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="502"/>
         <source>Control Port</source>
         <translation>ÐÐÑÑ ÐÐÐÑÑÐÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="576"/>
         <source>9051</source>
         <translation>9051</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="625"/>
         <source>Start Tor with the specified configuration file (torrc)</source>
         <translation>ÐÐÐÑÑÐÐÑÑ Tor Ñ ÑÐÐÐÐÐÐÑÐ ÑÐÐÐÐÐ ÐÐÐÑÐÐÑÑÐÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="644"/>
         <source>Select path to Tor configuration file</source>
         <translation>ÐÑÐÐÑÐÑÐ ÐÑÑÑ Ð ÑÐÐÐÑ ÐÐÑÑÑÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="647"/>
         <source>Browse</source>
         <translation>ÐÑÐÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="666"/>
         <source>Permissions</source>
         <translation>ÐÑÐÐÐ ÐÐÑÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="689"/>
         <source>Run as User:</source>
         <translation>ÐÐÐÑÑÐÐÑÑ ÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="702"/>
         <source>Vidalia will run with this User&apos;s permissions</source>
         <translation>Vidalia ÐÑÐÐÑ ÐÐÐÑÑÐÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="722"/>
         <source>Run as Group:</source>
         <translation>ÐÐÐÑÑÐÐÑÑ ÐÑ ÐÑÑÐÐÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="729"/>
         <source>Vidalia will run with this Group&apos;s permissions</source>
         <translation>Vidalia ÐÑÐÐÑ ÐÐÐÑÑÐÐÐ Ñ ÐÑÐÐÐÐÐ ÑÐÐÐÐÐÐÐÐ ÐÑÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="119"/>
         <source>Select Tor Configuration File</source>
         <translation>ÐÑÐÐÑÐÑÐ ÑÐÐÐ ÐÐÑÑÑÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="132"/>
         <source>File Not Found</source>
         <translation>ÐÐÐÐ ÐÐ ÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="134"/>
         <source>%1 does not exist. Would you like to create it?</source>
         <translation>%1 ÐÐ ÑÑÑÐÑÑÐÑÐÑ. ÐÐÐÐÐÑÑ?</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="145"/>
         <source>Failed to Create File</source>
         <translation>ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="146"/>
         <source>Unable to create %1 [%2]</source>
         <translation>ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ %1 [%2]</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="753"/>
         <source>Service</source>
         <translation>ÐÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="768"/>
         <source>Enable this if you wish to run Tor as a Windows service</source>
         <translation>ÐÐÐÑÑÐÑÐ, ÐÑÐÐ ÑÐÑÐÑÐ ÐÐÐÑÑÐÐÑÑ Tor ÐÐÐ ÑÐÑÐÐÑ Windows</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="771"/>
         <source>Run Tor in the background as a Windows service</source>
         <translation>ÐÐÐÑÑÐÐÑÑ Tor Ð ÑÐÐÐ ÐÐÐ ÑÐÑÐÐÑ Windows</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="169"/>
         <source>Unable to remove Tor Service</source>
         <translation>ÐÐ ÑÐÐÐÐÑÑ ÑÐÐÐÐÑÑ ÑÐÑÐÐÑ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="180"/>
         <source>Unable to install Tor Service</source>
         <translation>ÐÐ ÑÐÐÐÐÑÑ ÑÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="181"/>
         <source>Vidalia was unable to install the Tor service.</source>
         <translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÑÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ Tor.</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="171"/>
         <source>Vidalia was unable to remove the Tor service.
 
 You may need to remove it manually.</source>
@@ -140,22 +173,27 @@
 ÐÐÐÐÐÐÐÐ ÐÐÐ ÑÐÐÐÑÐÑ ÑÐÐÐÐÑÑ ÐÐÐ ÐÑÑÑÐÑÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="604"/>
         <source>Tor Configuration File</source>
         <translation>ÐÐÐÐ ÐÐÑÑÑÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="573"/>
         <source>Port that Vidalia uses to communicate with Tor.</source>
         <translation>ÐÐÑÑ, ÐÐÑÐÑÑÐ Vidalia ÐÑÐÐÐÑÐÑÐÑ ÐÐÑ ÑÐÑÐÐÐÐÐÐÑ Tor.</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.cpp" line="80"/>
         <source>&apos;%1&apos; is not a valid IP address.</source>
         <translation>ÐÐ ÑÐÐÐÐÑÑ ÑÐÑÐÐÐÐÐÑÑ IP ÐÐÑÐÑ Ð &apos;%1&apos;.</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="542"/>
         <source>IP address on which Tor is listening for controller connections.</source>
         <translation>IP ÐÐÑÐÑ ÐÐÐÐÑÑÑÐÑÐ ÐÐ ÐÐÑÐÑÐÐ Tor ÐÑÐÐÐÐÐÐÑ ÑÐÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐÐÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/config/advancedpage.ui" line="549"/>
         <source>:</source>
         <translation>:</translation>
     </message>
@@ -163,22 +201,27 @@
 <context>
     <name>AppearancePage</name>
     <message>
+        <location filename="../gui/config/appearancepage.ui" line="301"/>
         <source>Language</source>
         <translation>ÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/appearancepage.ui" line="322"/>
         <source>Choose the language used in Vidalia</source>
         <translation>ÐÑÐÐÑÐÑÐ ÑÐÑÐ ÐÐÑÐÑÑÐÐÑÐ ÐÐÑ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/config/appearancepage.ui" line="354"/>
         <source>Changes to language will only take effect after restarting Vidalia!</source>
         <translation>ÐÐÐÐÐÐÐÐÑ ÑÐÑÐÐ ÐÑÑÑÐÑÑ Ð ÑÐÐÑ ÑÐÐÑÐÐ ÐÐÑÐÐ ÐÐÑÐÐÐÐÑÑÐÐ ÐÑÐÐÑÐÐÐÑ!</translation>
     </message>
     <message>
+        <location filename="../gui/config/appearancepage.ui" line="370"/>
         <source>Style</source>
         <translation>ÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/appearancepage.ui" line="404"/>
         <source>Choose Vidalia&apos;s interface style</source>
         <translation>ÐÑÐÐÑÐÑÐ ÑÑÐÐÑ ÐÐÑÐÑÑÐÐÑÐ</translation>
     </message>
@@ -186,58 +229,72 @@
 <context>
     <name>BandwidthGraph</name>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="490"/>
         <source>Tor Bandwidth Usage</source>
         <translation>ÐÑÐÑÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="514"/>
         <source>Show Settings</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="537"/>
         <source>Reset</source>
         <translation>ÐÐÑÐÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="630"/>
         <source>Receive Rate</source>
         <translation>ÐÑÐÑÐÐ ÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="654"/>
         <source>Send Rate</source>
         <translation>ÐÑÐÑÐÐ ÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="773"/>
         <source>Changes the transparency of the Bandwidth Graph</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÑÐÐÑÐÑÐÐÑÑÑ ÑÑÐÐÐ ÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="932"/>
         <source>Save</source>
         <translation>ÐÐÑÑÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="939"/>
         <source>Cancel</source>
         <translation>ÐÑÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.cpp" line="170"/>
         <source>Since:</source>
         <translation>ÐÐÐÐÐÐÐÐ ÐÑ :</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="857"/>
         <source>100</source>
         <translation>100</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="872"/>
         <source>% Opaque</source>
         <translation>% ÐÐÐÑÐÐÑÐÑÐÐÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.cpp" line="236"/>
         <source>Hide Settings</source>
         <translation>ÐÐÑÑÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="667"/>
         <source>Always on Top</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/bwgraph.ui" line="723"/>
         <source>Style</source>
         <translation>ÐÑÐÐÑ</translation>
     </message>
@@ -245,26 +302,32 @@
 <context>
     <name>Circuit</name>
     <message>
+        <location filename="../control/circuit.cpp" line="109"/>
         <source>New</source>
         <translation>ÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/circuit.cpp" line="110"/>
         <source>Open</source>
         <translation>ÐÑÐÑÑÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/circuit.cpp" line="111"/>
         <source>Building</source>
         <translation>ÐÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../control/circuit.cpp" line="112"/>
         <source>Failed</source>
         <translation>ÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../control/circuit.cpp" line="113"/>
         <source>Closed</source>
         <translation>ÐÐÐÑÑÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/circuit.cpp" line="114"/>
         <source>Unknown</source>
         <translation>ÐÐÐÐÐÐÑÑÐÐ</translation>
     </message>
@@ -272,6 +335,7 @@
 <context>
     <name>CircuitItem</name>
     <message>
+        <location filename="../gui/network/circuititem.cpp" line="48"/>
         <source>&lt;Path Empty&gt;</source>
         <translation>&lt;ÐÐÑ ÐÑÑÐ&gt;</translation>
     </message>
@@ -279,22 +343,27 @@
 <context>
     <name>CircuitListWidget</name>
     <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
         <source>Connection</source>
         <translation>ÐÐÐÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
         <source>Status</source>
         <translation>ÐÐÑÑÐÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="56"/>
         <source>Close Circuit</source>
         <translation>ÐÐÐÑÑÑÑ ÑÐÐÐÑÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="62"/>
         <source>Close Stream</source>
         <translation>ÐÐÐÑÑÑÑ ÐÐÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="55"/>
         <source>Zoom to Circuit</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÐ ÐÐÑÑÐ</translation>
     </message>
@@ -302,38 +371,47 @@
 <context>
     <name>ConfigDialog</name>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="56"/>
         <source>General</source>
         <translation>ÐÐÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="59"/>
         <source>Server</source>
         <translation>ÐÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="65"/>
         <source>Advanced</source>
         <translation>ÐÐÑÐÐÑÑÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="83"/>
         <source>Cancel</source>
         <translation>ÐÑÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="62"/>
         <source>Appearance</source>
         <translation>ÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="78"/>
         <source>Save</source>
         <translation>ÐÐÑÑÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="154"/>
         <source>Error Saving Configuration</source>
         <translation>ÐÑÐÐÐÐ ÑÐÑÑÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.cpp" line="74"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/configdialog.ui" line="289"/>
         <source>Settings</source>
         <translation>ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
@@ -341,10 +419,12 @@
 <context>
     <name>ControlConnection</name>
     <message>
+        <location filename="../control/controlconnection.cpp" line="294"/>
         <source>Control socket is not connected.</source>
         <translation>ÐÐÑ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÐÑÐ.</translation>
     </message>
     <message>
+        <location filename="../control/controlconnection.cpp" line="239"/>
         <source>Control socket is not connected</source>
         <translation>ÐÐÑ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÐÑÐ</translation>
     </message>
@@ -352,34 +432,42 @@
 <context>
     <name>ControlSocket</name>
     <message>
+        <location filename="../control/controlsocket.cpp" line="65"/>
         <source>Error connecting to %1:%2 [%3]</source>
         <translation>ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÐÐÑ Ñ %1:%2 [%3]</translation>
     </message>
     <message>
+        <location filename="../control/controlsocket.cpp" line="101"/>
         <source>Error disconnecting socket. [%1]</source>
         <translation>ÐÑÐÐÐÐ ÐÐÐÑÑÑÐÑ ÑÐÐÐÑÐ. [%1]</translation>
     </message>
     <message>
+        <location filename="../control/controlsocket.cpp" line="159"/>
         <source>Error sending control command. [%1]</source>
         <translation>ÐÑÐÐÐÐ ÐÐÑÑÐÐÐ ÐÐÐÐÐÐÑ ÐÐÐÑÑÐÐÐÐÑÑ. [%1]</translation>
     </message>
     <message>
+        <location filename="../control/controlsocket.cpp" line="196"/>
         <source>Socket disconnected while attempting to read a line of data.</source>
         <translation>ÐÐÐÐÑ ÐÐÐÑÑÐÑÑ ÐÑÐ ÐÐÐÑÑÐÐ ÑÑÐÐÐÑ ÐÐÐÐÑÑ.</translation>
     </message>
     <message>
+        <location filename="../control/controlsocket.cpp" line="234"/>
         <source>Invalid control reply. [%1]</source>
         <translation>ÐÑÐÐÐÑÐÑÐ ÐÑÐÐÑ ÐÐÐÑÑÐÐÐÐÑÐ. [%1]</translation>
     </message>
     <message>
+        <location filename="../control/controlsocket.cpp" line="150"/>
         <source>Control socket is not connected.</source>
         <translation>ÐÐÑ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÑÐÐÐÑÐ ÐÐÐÑÑÐÐÐÐÑÐ.</translation>
     </message>
     <message>
+        <location filename="../control/controlsocket.cpp" line="81"/>
         <source>Vidalia was unable to determine Tor&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 ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑÑ ÐÐÐÐÑ ÐÐÑÑÐÐ ÐÑÐÑÐÐÐÐÐ Tor. ÐÑÐÐÐÑÑÑÐ, ÑÑÐ ÐÐÑÑ ÐÐÐÑÑÐÐÐÐÑÐ Tor ÑÐÐÐÐÐ ÐÐÑÑÐÐÑÐÐ Ð ÐÑ ÐÐÐÑÑÐÐÐÑÐ ÐÐ ÑÐÐÑÐÐÐ ÑÑÐÑÑÑ ÐÐÑÑÐÑ Tor.</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 ÐÐÐÐÐÑÐÐÐÐÐÑ ÑÐÐÑÐÐ ÐÐÑÑÐÑ 1 ÐÑÐÑÐÐÐÐÐ ÐÐÐÑÑÐÐÑ Tor (ÐÐÐÐÑÑÐÐÐÐ ÐÐÑÑÐÑ %1).
@@ -389,46 +477,57 @@
 <context>
     <name>GeneralPage</name>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="334"/>
         <source>Path to Tor&apos;s executable</source>
         <translation>ÐÑÑÑ Ð ÐÑÐÐÐÐÑÐÐÐÐÑ ÑÐÐÐÑ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="353"/>
         <source>Select path to Tor executable</source>
         <translation>ÐÑÐÐÑÐÑÐ ÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="356"/>
         <source>Browse</source>
         <translation>ÐÑÐÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="375"/>
         <source>Startup Options</source>
         <translation>ÐÐÑÐÐ ÐÐÐÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="390"/>
         <source>Select to start Vidalia on system boot</source>
         <translation>ÐÑÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÐÐÐÑÑÐÐÑÑ Vidalia ÐÑÐ ÑÑÐÑÑÐ ÑÐÑÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="393"/>
         <source>Run Vidalia on system startup</source>
         <translation>ÐÐÐÑÑÐÐÑÑ Vidalia ÐÑÐ ÑÑÐÑÑÐ ÑÐÑÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="406"/>
         <source>Set to start Tor when you launch Vidalia</source>
         <translation>ÐÑÑÐÐÐÐÐÑÐ ÑÑÐÐÑ ÐÐÐÑÑÐÐÑÑ Tor ÐÑÐ ÑÑÐÑÑÐ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="409"/>
         <source>Start Tor when Vidalia starts</source>
         <translation>ÐÐÐÑÑÐÐÑÑ Tor ÐÑÐ ÑÑÐÑÑÐ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.cpp" line="72"/>
         <source>Select Path to Tor</source>
         <translation>ÐÑÐÐÑÐÑÐ ÐÑÑÑ Ð Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.ui" line="307"/>
         <source>Tor Executable</source>
         <translation>ÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/generalpage.cpp" line="63"/>
         <source>Executables (*.exe)</source>
         <translation>ÐÑÐÐÐÐÑÐÐÑÐ ÑÐÐÐÑ (*.exe)</translation>
     </message>
@@ -436,26 +535,32 @@
 <context>
     <name>GraphFrame</name>
     <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="248"/>
         <source>Recv: </source>
         <translation>ÐÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="257"/>
         <source>Sent: </source>
         <translation>ÐÑÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="269"/>
         <source>%1 KB</source>
         <translation>%1 ÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="272"/>
         <source>%1 MB</source>
         <translation>%1 ÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="275"/>
         <source>%1 GB</source>
         <translation>%1 ÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/bwgraph/graphframe.cpp" line="296"/>
         <source>%1 KB/s</source>
         <translation>%1 ÐÐ/Ñ</translation>
     </message>
@@ -463,130 +568,162 @@
 <context>
     <name>HelpBrowser</name>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="303"/>
         <source>Vidalia Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="449"/>
         <source>Find Previous</source>
         <translation>ÐÐÐÑÐ ÐÑÐÐÑÐÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="462"/>
         <source>Find Next</source>
         <translation>ÐÐÐÑÐ ÑÐÐÐÑÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="496"/>
         <source>Case sensitive</source>
         <translation>Ð ÑÑÑÑÐÐ ÑÐÐÐÑÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="535"/>
         <source>Contents</source>
         <translation>ÐÐÐÐÑÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="580"/>
         <source>Help Topics</source>
         <translation>ÐÐÐÑ ÐÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="625"/>
         <source>Search</source>
         <translation>ÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="680"/>
         <source>Found Documents</source>
         <translation>ÐÐÐÐÐÐÐÑÐ ÐÐÐÑÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="759"/>
         <source>Back</source>
         <translation>ÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="762"/>
         <source>Move to previous page (Backspace)</source>
         <translation>ÐÐÑÐÑÑÑÑÑ ÐÐ ÐÑÐÐÑÐÑÑÑÑ ÑÑÑÐÐÐÑÑ (Backspace)</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="770"/>
         <source>Backspace</source>
         <translation>Backspace</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="778"/>
         <source>Forward</source>
         <translation>ÐÐÐÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="781"/>
         <source>Move to next page (Shift+Backspace)</source>
         <translation>ÐÐÑÐÐÑÐ ÐÐ ÑÐÐÐÑÑÑÑÑ ÑÑÑÐÐÐÑÑ (Shift+Backspace)</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="789"/>
         <source>Shift+Backspace</source>
         <translation>Shift+Backspace</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="797"/>
         <source>Home</source>
         <translation>ÐÐÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="800"/>
         <source>Move to the Home page (Ctrl+H)</source>
         <translation>ÐÐÑÐÐÑÐ ÐÐ ÐÐÑÐÐÑÐÑÑ ÑÑÑÐÐÐÑÑ (Ctrl+H)</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="808"/>
         <source>Ctrl+H</source>
         <translation>Ctrl+H</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="825"/>
         <source>Find</source>
         <translation>ÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="828"/>
         <source>Search for a word or phrase on current page (Ctrl+F)</source>
         <translation>ÐÐÐÑÐ ÑÐÐÐÐ ÐÐÐ ÑÑÐÐÑ ÐÐ ÑÐÐÑÑÐÐ ÑÑÑÐÐÐÑÐ (Ctrl+F)</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="836"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="844"/>
         <source>Close</source>
         <translation>ÐÐÐÑÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="847"/>
         <source>Close Vidalia Help</source>
         <translation>ÐÐÐÑÑÑÑ ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="855"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="121"/>
         <source>Error Loading Help Contents: </source>
         <translation>ÐÑÐÐÐÐ ÐÐÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐÑ ÐÐÐÐÑÐ: </translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="372"/>
         <source>Search reached end of document</source>
         <translation>ÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÐÑÐ ÐÐÐÑÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="374"/>
         <source>Search reached start of document</source>
         <translation>ÐÐÐÑÐ ÐÐÑÑÐÐ ÐÐÑÐÐÐ ÐÐÐÑÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="376"/>
         <source>Text not found in document</source>
         <translation>ÐÐÐÑÑ ÐÐ ÐÐÐÐÐÐ Ð ÐÐÐÑÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="427"/>
         <source>Find:</source>
         <translation>ÐÐÐÑÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="506"/>
         <source>Whole words only</source>
         <translation>ÐÐÐÑÐÐ ÑÐÐÐÐ ÑÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.ui" line="637"/>
         <source>Searching for:</source>
         <translation>ÐÑÐÐÑÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="133"/>
         <source>Supplied XML file is not a valid Contents document.</source>
         <translation>ÐÑÐÐÐÑÑÐÐÐÐÐÐÑÐ XML ÐÐ ÑÐÐÑÐÑÑÑ ÐÐÑÑÐÐÑÐÑÐ ÐÑÐÐÑÐÐÐÑÐÐ ÐÐÐÐÑÐÐÐÐÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/help/browser/helpbrowser.cpp" line="421"/>
         <source>Found %1 results</source>
         <translation>ÐÐÐÑÐÑÑÐÑÐÐ ÐÐÐÑÐÐ: %1</translation>
     </message>
@@ -594,6 +731,7 @@
 <context>
     <name>HelpTextBrowser</name>
     <message>
+        <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
         <source>Error opening help file: </source>
         <translation>ÐÑÐÐÐÐ ÐÑÐÑÑÑÐÑ ÑÐÐÐÐ ÐÐÐÐÑÐ: </translation>
     </message>
@@ -601,26 +739,32 @@
 <context>
     <name>LogEvent</name>
     <message>
+        <location filename="../control/logevent.cpp" line="68"/>
         <source>Debug</source>
         <translation>Debug</translation>
     </message>
     <message>
+        <location filename="../control/logevent.cpp" line="69"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
+        <location filename="../control/logevent.cpp" line="70"/>
         <source>Notice</source>
         <translation>ÐÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../control/logevent.cpp" line="71"/>
         <source>Warning</source>
         <translation>ÐÑÐÐÑÐÑÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../control/logevent.cpp" line="72"/>
         <source>Error</source>
         <translation>ÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../control/logevent.cpp" line="73"/>
         <source>Unknown</source>
         <translation>ÐÐÐÐÐÐÑÑÐÐ</translation>
     </message>
@@ -628,10 +772,12 @@
 <context>
     <name>LogTreeWidget</name>
     <message>
+        <location filename="../gui/log/logtreewidget.cpp" line="40"/>
         <source>Messages Shown: </source>
         <translation>ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ: </translation>
     </message>
     <message>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>ÐÐÐÐÑÐÐÐÐ ÐÐÐÐÐÐÐÐ: %1</translation>
     </message>
@@ -639,126 +785,157 @@
 <context>
     <name>MainWindow</name>
     <message>
+        <location filename="" line="7667826"/>
         <source>Tor is Stopped</source>
         <translation type="obsolete">Tor ÐÑÑÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="" line="7667826"/>
         <source>Start</source>
         <translation type="obsolete">ÐÐÐÑÑÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="" line="7667826"/>
         <source>Stop</source>
         <translation type="obsolete">ÐÑÑÐÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>Ð ÐÑÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>ÐÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>ÐÑÐÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="" line="7667826"/>
         <source>Ctrl+S</source>
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>ÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>ÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>ÐÑÐÐÐÐ ÐÐÐÑÑÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>ÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÐÐÐÐÑ Ð Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>ÐÑÐÐÐÐ ÐÑÑÐÐÐÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="" line="7667826"/>
         <source>Tor is stopped</source>
         <translation type="obsolete">Tor ÐÑÑÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor ÐÐÐÐÑÑÐÐ ÑÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÑÑÐÐÐÐÐÑÑ Tor.</translation>
     </message>
     <message>
+        <location filename="" line="7667826"/>
         <source>Tor is starting</source>
         <translation type="obsolete">Tor ÐÐÐÑÑÐÐÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor ÐÐÐÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>ÐÐÑÐÐÑ ÐÐÐÑÑÑÐ</translation>
     </message>
     <message>
+        <location filename="" line="7667826"/>
         <source>Tor is stopping</source>
         <translation type="obsolete">Tor ÐÑÑÐÐÐÐÐÐÐÐÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>ÐÑÐÐÐÐ ÐÑÐÐÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÑÐÐÐÐÐÑÑ ÐÐÑÐ ÐÐÑÑÑÐÐÐÐ ÐÐÑ ÑÐÑÐÐÑÐ.</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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>
@@ -767,6 +944,7 @@
 ÐÐ ÑÐÑÐÑÐ ÐÐ ÐÑ ÐÐÐÑÑÐÑÐÐ ÐÑÑÐÐÐÐÐÑÑ ÑÐÑÐÐÑ Ð ÐÐÑÑ ÐÐÐÐÐÑÐÐ ÐÐÐÐÐÐÐ ÐÑÐÐÐÐÐ ÑÑÐÐÑ ÐÐÐÑÐ ÐÑÑÐÐÐ ÑÐÑÐÐÑ?</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
@@ -775,293 +953,385 @@
 ÐÐÐÐÐÑÐÑÑÐ ÐÑÐÐÐÑÑÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÐÑÑÐÐÐÐ, ÑÑÐÐÑ ÑÐÐÐÑÑ ÑÑÐ ÐÑÐÐÐÐÑÐÐ.</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="257"/>
         <source>Network Map</source>
         <translation>ÐÐÑÑÐ ÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>ÐÐÐÑÐ ÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>ÐÑÐ ÐÐÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐÐÑ ÐÐ ÐÑÐÑÑ ÑÐÑÐÐÐÑ Ñ ÐÑÐÐÑÐÑÑÐÐÐ ÑÐÐÐÐÐÐÐÐÑÐÐ.</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>ÐÑÐÐÐÐ ÑÐÐÐÐÐÐÑ ÐÐÐÐÐÐ ÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation>ÐÐÐÑÑÑÐÑÑ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation>Tor ÐÐ ÐÐÐÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation>Tor ÐÑÐÐÑÑÐÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation>ÐÑÑÐÐÐÐÐÑÑ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation>Tor ÐÐÐÑÑÐÐÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation>ÐÐÐÐÐÑ ÑÐÑÐÐÐÐÐÐÑ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation>ÐÐÑÑÐÑÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation>ÐÑÐÑÐÐ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation>ÐÐÑÑÑÐÐÑÑ ÑÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <source>Set up a Tor relay and help the network grow</source>
         <translation>ÐÐÑÑÑÐÐÑÐ ÑÐÑÐÐÑ - ÑÐÐÑÐÐÑÑÐÑÐÑÐ ÑÐÐÐÐÑÐÐÐÑ ÑÐÑÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation>ÐÑÐÑÐÐÑÑÐÑÑ ÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation>ÐÑÐÑÐÐÑÑÐÑÑ ÐÐÑÑÑ ÑÐÑÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation>ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÐÑÐ ÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation>ÐÐÑÐÐÐÑÑÑÐÐ ÑÐÐÐÐÐÐÐÐÑ ÐÑÐÑÑ ÐÑÐÐÑÐÐÑÑ ÐÐÐÐÐÐÑÐÐÑÐÐ ÐÑ ÑÐÐÑÑÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation>ÐÑÐÑÐÐÑÑÐÑÑ ÑÑÐÑÐÑÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÐÐÑ  ÑÑÐÑÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation>ÐÑÐÑÐÐÑÑÐÑÑ ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation>ÐÑÐÑÐÐÑÑÐÑÑ ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation>ÐÐÑÑÑÐÐÑÑ Tor Ð Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation>ÐÐÑÑÐÑ Ð ÐÐÑÐÑÐÐÑÐÑ Ð ÐÐÑÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation>ÐÐÐÑÑÑÑ Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation>ÐÐÐÐÐÑÐÐÑÑ ÑÑÐ ÐÐÐÐ ÐÑÐ ÐÐÐÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation>ÐÐÑÑÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation>ÐÐÑÑÑÐÑÑ ÑÑÐ ÐÐÐÐ</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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>ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="336"/>
         <source>Time</source>
         <translation>ÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="341"/>
         <source>Type</source>
         <translation>ÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="346"/>
         <source>Message</source>
         <translation>ÐÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="646"/>
         <source>Browse</source>
         <translation>ÐÑÐÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="430"/>
         <source>Saves the current Message Log settings</source>
         <translation>ÐÐÑÑÐÐÐÑÑ ÑÐÐÑÑÐÐ ÐÐÑÑÑÐÐÐÐ ÐÑÑÐÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="433"/>
         <source>Save Settings</source>
         <translation>ÐÐÑÑÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="449"/>
         <source>Cancels changes made to settings</source>
         <translation>ÐÑÐÐÐÐÑÑ ÐÐÐÐÐÐÐÐÑ ÐÐÑÑÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="452"/>
         <source>Cancel</source>
         <translation>ÐÑÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="466"/>
         <source>Message Filter</source>
         <translation>ÐÐÐÑÑÑ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="487"/>
         <source>Error</source>
         <translation>ÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="503"/>
         <source>Warning</source>
         <translation>ÐÑÐÐÑÐÑÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="519"/>
         <source>Notice</source>
         <translation>ÐÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="535"/>
         <source>Info</source>
         <translation>Info</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="551"/>
         <source>Debug</source>
         <translation>Debug</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="727"/>
         <source>Message Filters...</source>
         <translation>ÐÐÐÑÑÑÑ ÑÐÐÐÑÐÐÐÐ...</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="730"/>
         <source>Set message filters</source>
         <translation>ÐÑÑÐÐÐÐÐÑÑ ÑÐÐÑÑÑÑ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="743"/>
         <source>History Size...</source>
         <translation>ÐÐÐÐÐÑ ÐÑÑÐÑÐÐ...</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="746"/>
         <source>Set maximum number of messages to display</source>
         <translation>ÐÑÑÐÐÐÐÐÑÑ ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÐÑÐÑÑÐÐ ÑÐÐÐÑÐÐÐÐ ÐÐÑ ÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="762"/>
         <source>Clear</source>
         <translation>ÐÑÐÑÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="765"/>
         <source>Clear all messages from the Message Log (Ctrl+E)</source>
         <translation>ÐÐÐÐÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐÐÑ ÐÐ ÐÑÑÐÐÐÐ (Ctrl+E)</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="773"/>
         <source>Ctrl+E</source>
         <translation>Ctrl+E</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="787"/>
         <source>Copy</source>
         <translation>ÐÐÐÐÑÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="790"/>
         <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
         <translation>ÐÐÐÐÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÐÑÑÐÑ ÐÐÐÐÐÐ (Ctrl+C)</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="798"/>
         <source>Ctrl+C</source>
         <translation>Ctrl+C</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="809"/>
         <source>Select All</source>
         <translation>ÐÑÐÑÐÑÑ ÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="812"/>
         <source>Select all messages (Ctrl+A)</source>
         <translation>ÐÑÐÑÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐÐÑ (Ctrl+A)</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="820"/>
         <source>Ctrl+A</source>
         <translation>Ctrl+A</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="828"/>
         <source>Save All</source>
         <translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="831"/>
         <source>Save all messages to a file</source>
         <translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="844"/>
         <source>Save Selected</source>
         <translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="847"/>
         <source>Save selected messages to a file</source>
         <translation>ÐÐÑÑÐÐÐÑÑ ÐÑÐÐÐÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ Ð ÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="901"/>
         <source>Close</source>
         <translation>ÐÐÐÑÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="904"/>
         <source>Close the Message Log</source>
         <translation>ÐÐÐÑÑÑÑ ÐÑÑÐÐÐ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="912"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="923"/>
         <source>Find</source>
         <translation>ÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="926"/>
         <source>Find all messages containing the search text (Ctrl+F)</source>
         <translation>ÐÐÐÑÐ ÐÑÐ ÑÐÐÐÑÐÐÐÑ Ñ ÐÑÐÐÐÑÐ ÑÐÐÑÑÐÐ (Ctrl+F)</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="934"/>
         <source>Ctrl+F</source>
         <translation>Ctrl+F</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="148"/>
         <source>Messages that appear when something has 
 gone very wrong and Tor cannot proceed.</source>
         <translation> ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÑÐÐÑÑÑÑÑ ÐÐÐÐÐ ÑÑÐ-ÑÐ ÐÑÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐ
 Ð Tor ÐÐ ÐÐÐÐÑ ÐÑÐÐÐÐÐÐÑÑ ÑÐÐÐÑÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="150"/>
         <source>Messages that only appear when 
 something has gone wrong with Tor.</source>
         <translation> ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÑÐÐÑÑÑÑÑ ÐÐÐÐÐ
 ÑÑÐ-ÑÐ ÐÐ ÑÐÐ Ñ Tor.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="154"/>
         <source>Messages that appear infrequently 
 during normal Tor operation and are 
 not considered errors, but you may 
@@ -1072,12 +1342,14 @@
 ÑÑÐÑÑ ÐÐÑÐÐÐ ÐÐÐÐÐÐÐÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="156"/>
         <source>Messages that appear frequently 
 during normal Tor operation.</source>
         <translation> ÐÐÐÐÑÐÐÐÑ ÐÐÑÐÑÑÐ ÐÐÑÐÐÑÑÑÑÑ ÑÐÑÑÐ 
 ÐÐ ÐÑÐÐÑ ÐÐÑÑÐÐÐ ÑÐÐÐÑÑ Tor.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="158"/>
         <source>Hyper-verbose messages primarily of 
 interest to Tor developers.</source>
         <translation> ÐÑÐÐÑ ÐÐÐÑÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ,
@@ -1085,66 +1357,82 @@
 ÑÐÐÑÐÐÐÑÑÐÐÐÐ Tor.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="203"/>
         <source>Error Setting Filter</source>
         <translation>ÐÑÐÐÐÐ ÑÑÑÐÐÐÐÐÐ ÑÐÐÑÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="219"/>
         <source>Error Opening Log File</source>
         <translation>ÐÑÐÐÐÐ ÐÑÐÑÑÑÐÑ ÑÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="294"/>
         <source>Select Log File</source>
         <translation>ÐÑÐÐÑÐÑÐ ÑÐÐÐ ÐÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="311"/>
         <source>Save Log Messages</source>
         <translation>ÐÐÑÑÐÐÐÑÑ ÑÐÐÐÑÐÐÐÑ ÐÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="323"/>
         <source>Vidalia</source>
         <translation>Vidalia</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="376"/>
         <source>Find in Message Log</source>
         <translation>ÐÐÐÑÐ Ð ÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="377"/>
         <source>Find:</source>
         <translation>ÐÐÐÑÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="383"/>
         <source>Not Found</source>
         <translation>ÐÐ ÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="384"/>
         <source>Search found 0 matches.</source>
         <translation>ÐÐÑÐÐÐ ÐÐ ÐÐÐÐÐÐÐ.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="863"/>
         <source>Settings</source>
         <translation>ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="866"/>
         <source>Adjust Message Log Settings</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="874"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="882"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="885"/>
         <source>Show the help browser</source>
         <translation>ÐÑÐÑÑÑÑ ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="204"/>
         <source>Vidalia was unable to register for Tor&apos;s log events.</source>
         <translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐÑÑÑÐÑÐÐÐÑÑÑÑ ÐÐÑ ÐÐÐÑÑÐÐÐÑ ÑÐÐÐÑÐÐÐÐ Tor.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="324"/>
         <source>Cannot write file %1
 
 %2.</source>
@@ -1153,46 +1441,57 @@
 %2.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="220"/>
         <source>Vidalia was unable to open the specified log file.</source>
         <translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÑÐÑÑÑÑ ÑÐÐÐÐÐÐÑÐ ÑÐÐÐ ÐÑÑÐÐÐÐ.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="314"/>
         <source>Text Files (*.txt)</source>
         <translation>ÐÐÐÑÑÐÐÑÐ ÑÐÐÐÑ (*.txt)</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="893"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="241"/>
         <source>Log Filename Required</source>
         <translation>ÐÑÐÐÑÐÑÑÑ ÑÐÐÐÐÑÑ ÐÐÑ ÑÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.cpp" line="243"/>
         <source>You must enter a filename to be able to save log messages to a file.</source>
         <translation>ÐÑ ÐÐÐÐÐÑ ÐÐÐÑÑÐ ÐÐÑ ÑÐÐÐÐ ÑÑÐÐÑ ÑÐÑÑÐÐÐÑÑ ÐÐÐÐÑÐ ÐÑÑÐÐÐÐ Ð ÑÐÐÐ.</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="567"/>
         <source>Message Log History</source>
         <translation>ÐÑÑÐÑÐÑ ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="588"/>
         <source>Number of messages to display in the message log window</source>
         <translation>ÐÐÐÐÑÐÑÑÐÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÐÐÐ ÐÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="612"/>
         <source>messages</source>
         <translation>ÑÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="631"/>
         <source>Always Save New Log Messages</source>
         <translation>ÐÑÐÐÐÐ ÑÐÑÑÐÐÑÑÑ ÐÐÐÑÐ ÑÐÐÐÑÐÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="669"/>
         <source>Enable automatically saving all new log messages to a file</source>
         <translation>ÐÐÐÑÑÐÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐÐ ÑÐÑÑÐÐÐÐÐÐ ÐÑÐÑ ÐÐÐÑÑ ÑÐÐÐÑÐÐÐÐ Ð ÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/log/messagelog.ui" line="672"/>
         <source>Automatically save new log messages to a file</source>
         <translation>ÐÐÑÑÐÐÑÑÑ Ð ÑÐÐÐ</translation>
     </message>
@@ -1200,82 +1499,102 @@
 <context>
     <name>NetViewer</name>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="297"/>
         <source>View Tor Network</source>
         <translation>ÐÑÐÑÐÐÑÑÐÑÑ ÑÐÑÑ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="518"/>
         <source>Refresh</source>
         <translation>ÐÐÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="540"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="562"/>
         <source>Close</source>
         <translation>ÐÐÐÑÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="584"/>
         <source>Zoom In</source>
         <translation>ÐÐÐÐÐÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="606"/>
         <source>Zoom Out</source>
         <translation>ÐÐÐÐÑÑÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="524"/>
         <source>Refresh the list of routers and connections</source>
         <translation>ÐÐÐÐÐÐÑÑ ÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐ Ð ÑÐÐÐÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="543"/>
         <source>Show network map help</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÑ ÐÐ ÐÐÑÑÐ ÑÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="546"/>
         <source>Show the network map help</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÐÐÐÑÑ ÐÐ ÐÐÑÑÐ ÑÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="568"/>
         <source>Close the network map</source>
         <translation>ÐÐÐÑÑÑÑ ÐÐÑÑÑ ÑÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="590"/>
         <source>Zoom in on the network map</source>
         <translation>ÐÐÐÐÐÑÐÑÑ ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="612"/>
         <source>Zoom out on the network map</source>
         <translation>ÐÐÐÐÑÑÐÑÑ ÐÐÐÐÑÐÐÐÐÐÐ ÐÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="628"/>
         <source>Zoom To Fit</source>
         <translation>ÐÐÑÐÐÐÐÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="634"/>
         <source>Zooms to fit all currently displayed circuits</source>
         <translation>ÐÐÐÐÐÑÐÑÑ ÑÐÐ ÑÑÐÐÑ ÐÐÐÐÐÐÑÑ ÐÑÐ ÑÐÐÐÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="532"/>
         <source>Ctrl+R</source>
         <translation>Ctrl+R</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="554"/>
         <source>F1</source>
         <translation>F1</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="576"/>
         <source>Esc</source>
         <translation>Esc</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="598"/>
         <source>+</source>
         <translation>+</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="620"/>
         <source>-</source>
         <translation>-</translation>
     </message>
     <message>
+        <location filename="../gui/network/netviewer.ui" line="642"/>
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
@@ -1283,10 +1602,12 @@
 <context>
     <name>Policy</name>
     <message>
+        <location filename="../config/policy.cpp" line="178"/>
         <source>accept</source>
         <translation>ÐÑÐÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../config/policy.cpp" line="178"/>
         <source>reject</source>
         <translation>ÐÑÐÐÐÐÑÑÑ</translation>
     </message>
@@ -1294,14 +1615,17 @@
 <context>
     <name>RouterDescriptor</name>
     <message>
+        <location filename="../control/routerdescriptor.cpp" line="87"/>
         <source>Online</source>
         <translation>ÐÐÐÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../control/routerdescriptor.cpp" line="89"/>
         <source>Hibernating</source>
         <translation>ÐÐ ÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../control/routerdescriptor.cpp" line="91"/>
         <source>Offline</source>
         <translation>ÐÑÐÐÑÑÐÐ</translation>
     </message>
@@ -1309,26 +1633,32 @@
 <context>
     <name>RouterDescriptorView</name>
     <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
         <source>IP Address:</source>
         <translation>IP ÐÐÑÐÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
         <source>Platform:</source>
         <translation>ÐÐÐÑÑÐÑÐÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
         <source>Bandwidth:</source>
         <translation>ÐÑÐÑÐÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
         <source>Uptime:</source>
         <translation>ÐÑÐÐÑ ÑÐÐÐÑÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
         <source>Last Updated:</source>
         <translation>ÐÐÐÐÐÐÐÐÐÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
         <source>Location:</source>
         <translation>ÐÐÑÑÐÐÐÑÐÐÐÐÐÐÐ:</translation>
     </message>
@@ -1336,14 +1666,17 @@
 <context>
     <name>RouterListItem</name>
     <message>
+        <location filename="../gui/network/routerlistitem.cpp" line="94"/>
         <source>%1 KB/s</source>
         <translation>%1 ÐÐ/Ñ</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerlistitem.cpp" line="78"/>
         <source>Offline</source>
         <translation>ÐÑÐÐÑÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerlistitem.cpp" line="82"/>
         <source>Hibernating</source>
         <translation>ÐÐ ÐÐÑÐÐÐÐ</translation>
     </message>
@@ -1351,14 +1684,17 @@
 <context>
     <name>RouterListWidget</name>
     <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="44"/>
         <source>Server</source>
         <translation>ÐÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="55"/>
         <source>Zoom to Server</source>
         <translation>ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/network/routerlistwidget.cpp" line="231"/>
         <source>%1 servers online (%2 total)</source>
         <translation>ÐÐÑÐÐÑÐÐ Ð ÐÐÐÐÐÐÐ - %1 (ÐÑÐÐÐ %2)</translation>
     </message>
@@ -1366,86 +1702,107 @@
 <context>
     <name>ServerPage</name>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="502"/>
         <source>Check to run as a Tor network server</source>
         <translation>ÐÐÐÑÑÐÑÐ ÑÑÐÐÑ ÑÑÐÑÑ ÑÐÑÐÐÑÐÐ ÑÐÑÐ Tor</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="505"/>
         <source>Relay traffic for the Tor network</source>
         <translation>ÐÐÐÐÐ ÑÐÑÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="716"/>
         <source>Directory Port:</source>
         <translation>ÐÐÑÑ ÐÐÑÐÐÑÐÑÐÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="746"/>
         <source>Directory Port Number</source>
         <translation>ÐÐÐÐÑ ÐÐÑÑÐ ÐÐÑ ÐÐÐÑÐÑÐÐ ÐÐÑÐÐÑÐÑÐÐ (ÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐ)</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="616"/>
         <source>Nickname:</source>
         <translation>ÐÐÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="821"/>
         <source>Name of your server</source>
         <translation>ÐÐÑ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="684"/>
         <source>Contact Info:</source>
         <translation>ÐÐÐÑÐÐÑÐÐÑ ÐÐÑÐÑÐÐÑÐÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="638"/>
         <source>Server Port:</source>
         <translation>ÐÐÑÑ ÑÐÑÐÐÑÐ:</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="674"/>
         <source>Port on which users and other servers can communicate with your server</source>
         <translation>ÐÐÑÑ ÐÐ ÐÐÑÐÑÐÐÑ ÐÑÑÐÐÐ ÐÐÐÐÐÑÑ Ð ÑÐÑÐÐÑÑ ÐÑÐÑÑ ÐÐÐÑÐÐÐÐÐÑÑÑÑÑ Ð ÐÐÑÐÐÑ ÑÐÑÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="565"/>
         <source>Address:</source>
         <translation>ÐÐÑÐÑ:</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="781"/>
         <source>Domain name or IP address of your server</source>
         <translation>ÐÐÐÐÐÐÐÐ ÐÐÑ ÐÐÐ IP ÐÐÑÐÑ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="837"/>
         <source>Enable to mirror the server directory</source>
         <translation>ÐÐÐÑÑÐÑÐ ÑÑÐÐÑ ÐÐÑÐÐÐÐÑÐÐÐÑÑÑ ÑÐÐÑÐÐ ÑÐÑÑÐÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="840"/>
         <source>Mirror the Server Directory </source>
         <translation>ÐÐÑÐÐÐÐÑÑ Directory</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="590"/>
         <source>Attempts to determine the correct address for your server</source>
         <translation>ÐÐÐÑÑÐÑÑÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ ÐÐÑÐÐÐÐÐÑÑ ÐÑÐÐÐÐÑÐÑÐ ÐÐÑÐÑ ÐÐÑÐÐÐ ÑÐÑÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="593"/>
         <source>Get Address</source>
         <translation>ÐÐÐÑÑÐÑÑ ÐÐÑÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1251"/>
         <source>Exit Policies</source>
         <translation>ÐÐÐÐÑÐÐÐ ÐÑÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1377"/>
         <source>Show help topic on exit policies</source>
         <translation>ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÐÑ ÐÐ ÐÑÐÐÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.cpp" line="148"/>
         <source>You must specify at least a server nickname and port.</source>
         <translation>ÐÑ ÐÐÐÐÐÑ ÑÐÐÐÐÑÑ ÐÐÐ ÐÐÐÐÐÑÐ ÐÐÑ ÑÐÑÐÐÑÐ Ð ÐÐÑÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.cpp" line="232"/>
         <source>Error</source>
         <translation>ÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.cpp" line="233"/>
         <source>Vidalia was unable to determine your public IP address.</source>
         <translation>Vidalia ÐÐ ÑÐÐÐÐÐ ÐÐÑÐÐÐÐÐÑÑ ÐÐÑ ÐÑÐÐÐÑÐÑÐ IP ÐÐÑÐÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.cpp" line="250"/>
         <source>Vidalia was only able to find a private IP address for your server.
 
 Would you like to access an external service to determine your public IP address?</source>
@@ -1454,14 +1811,17 @@
 ÐÐÑÐÑÐ ÐÐ ÐÑ ÐÐÑÐÐÐÐÐÑÑ ÐÐÑ IP ÐÐÑÐÑ Ñ ÐÐÐÐÑÑÑ ÐÐÐÑÐÐÐÐ ÑÐÑÐÐÑÐ?</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="850"/>
         <source>When enabled, Vidalia will periodically update your IP address if necessary</source>
         <translation>ÐÑÐÐ ÐÐÐÑÑÐÐÐ, Vidalia ÐÑÐÐÑ ÐÐÑÐÐÐÐÑÐÑÐÐ ÐÐÐÐÐÐÑÑÑ ÐÐÑ IP ÐÐÑÐÑ ÐÑÐÐ ÐÐ ÐÐÐÐÐÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="853"/>
         <source>Automatically Update</source>
         <translation>ÐÐÐÐÐÐÑÑÑ ÐÐÑÐÐÐÑÐÑÐÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="806"/>
         <source>Email address at which you may be reached if there is a
 problem with your server. You might also include your PGP or GPG
 fingerprint.</source>
@@ -1470,122 +1830,152 @@
 PGP ÐÐÐ GPG ÐÐÑÑÐ.</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1107"/>
         <source>Long-term average bandwidth limit</source>
         <translation>ÐÐÐÐÐÐÑÐÐÐÐÐÐÐ ÑÑÑÐÐÐÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÐ ÑÑÐÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1078"/>
         <source>Average Rate</source>
         <translation>ÐÑÐÐÐÐÐ ÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1195"/>
         <source>KB/s</source>
         <translation>ÐÐ/Ñ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1182"/>
         <source>Peak bandwidth rate limit</source>
         <translation>ÐÐÑÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÑ ÑÑÐÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1153"/>
         <source>Maximum Rate</source>
         <translation>ÐÐÐÑÐÐÐÐÑÐÐÐ ÐÐÐÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="989"/>
         <source>Show help topic on bandwidth rate limits</source>
         <translation>ÐÐÐÐÐÐÑÑ ÑÐÑÐÐÐÑ ÐÐ ÐÐÑÐÐÐÑÐÐÐÑ ÑÑÐÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="537"/>
         <source>Basic Settings</source>
         <translation>ÐÐÐÐÐÑÐ ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="887"/>
         <source>Bandwidth Limits</source>
         <translation>ÐÐÑÐÐÐÑÐÐÐÑ ÑÑÐÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="922"/>
         <source>For Internet connections with fast download speed but slow upload, please list your upload speed here.</source>
         <translation>ÐÐÑ ÐÐÑÐÑÐÐÑ-ÑÐÐÐÐÐÐÐÐÐ Ñ ÐÐÐÑÑÐÐ ÐÑÐÐÑÑÐÐ ÑÐÐÑÐÑÑÑÑ, ÐÐ ÐÐÐÐÐ ÐÑÑÐÐÑÑÐÐ, ÐÐÐÐÐÑÐÑÑÐ ÑÐÐÐÑÐÐÐÑÐ ÐÑÑÐÐÑÑÑÑ.</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="943"/>
         <source>Select the entry that most closely resembles your Internet connection</source>
         <translation>ÐÑÐÐÑÐÑÐ ÐÑÐÐÑ ÐÐÑÐÑÑÐ ÐÐÐÐÐ ÐÑÐÐÐ ÐÐÐÑÐÐÐÑ ÐÐÑ ÐÐÐÑÐÐÐÑ ÐÐÑÐÐÐ ÑÐÐÐÐÐÐÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="953"/>
         <source>Cable/DSL 256 Kbps</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="958"/>
         <source>Cable/DSL 512 Kbps</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="963"/>
         <source>Cable/DSL 768 Kbps</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="968"/>
         <source>T1/Cable/DSL 1.5 Mbps</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="973"/>
         <source>&gt; 1.5 Mbps</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="978"/>
         <source>Custom</source>
         <translation>ÐÑÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1289"/>
         <source>Ports 6660 - 6669 and 6697</source>
         <translation>ÐÐÑÑÑ 6660 - 6669 Ð 6697</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1292"/>
         <source>Internet Relay Chat (IRC)</source>
         <translation></translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1302"/>
         <source>Ports 110, 143, 993 and 995</source>
         <translation>ÐÐÑÑÑ 110, 143, 993 Ð 995</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1305"/>
         <source>Retrieve Mail (POP, IMAP)</source>
         <translation>ÐÐÐÑÑÐÐÐÐ ÐÐÑÑÑ (POP, IMAP)</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1315"/>
         <source>Ports unspecified by other checkboxes</source>
         <translation>ÐÐÑÑÑ ÐÐ ÑÐÐÐÐÐÐÑÐ Ð ÐÑÑÐÐÑ checkbox&apos;ÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1318"/>
         <source>Misc Other Services</source>
         <translation>ÐÑÑÐÐÐ ÑÐÑÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1328"/>
         <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
         <translation>ÐÐÑÑÑ 706, 1863, 5050, 5190, 5222, 8300 Ð 8888</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1331"/>
         <source>Instant Messaging (IM)</source>
         <translation>ÐÐÑÑÐÐÑ ÐÐÐÐÐÐÐÐÐÐÐ ÐÐÐÐÐÐ ÑÐÐÐÑÐÐÐÑÐÐ (IM)</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1341"/>
         <source>Port 443</source>
         <translation>ÐÐÑÑ 443</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1344"/>
         <source>Secure Websites (SSL)</source>
         <translation>ÐÐÑÐÑÑÐÐÑÐ ÐÐÐ-ÑÐÐÑÑ (SSL)</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1354"/>
         <source>Port 80</source>
         <translation>ÐÐÑÑ 80</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1357"/>
         <source>Websites</source>
         <translation>ÐÐÐ-ÑÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1450"/>
         <source>What Internet resources should Tor users be able to access from your Tor relay?</source>
         <translation>ÐÐÐÐÐ ÐÐÑÐÑÐÐÑ-ÑÐÑÑÑÑÑ ÐÑÐÑÑ ÐÐÑÑÑÐÐÑ ÐÐÐÑÐÐÐÐÑÐÐÑÐ Tor ÑÐÑÐÐ ÐÐÑ ÑÐÑÐÐÑ?</translation>
     </message>
     <message>
+        <location filename="../gui/config/serverpage.ui" line="1224"/>
         <source>Your maximum bandwidth rate must be greater than or equal to your average bandwidth rate. Both values must be at least 20 KB/s.</source>
         <translation>ÐÐÑÐÐÐÑÐÐÐÐ ÐÐÐÑÐÐÐÐÑÐÐÐÐ ÑÑÐÐÐÑ ÑÑÐÑÐÐÐ ÐÐÐÐÐÐ ÐÑÑÑ ÐÐÐÑÑÐ ÐÐÐ ÑÐÐÐÐ ÐÐÑÐÐÐÑÐÐÐÑ ÑÑÐÐÐÐÐÐ ÑÑÐÐÐÑ ÑÑÐÑÐÐÐ. ÐÐÐ ÐÐÐÑÐÐÐÑ ÐÐ ÐÐÐÑÑ ÐÑÑÑ ÐÐÐÑÑÐ 20 ÐÐ/ÑÐÐ.</translation>
     </message>
@@ -1593,34 +1983,42 @@
 <context>
     <name>Stream</name>
     <message>
+        <location filename="../control/stream.cpp" line="110"/>
         <source>New</source>
         <translation>ÐÐÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/stream.cpp" line="112"/>
         <source>Resolving</source>
         <translation>ÐÐÑÐÐÐÐÑÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../control/stream.cpp" line="113"/>
         <source>Connecting</source>
         <translation>ÐÐÐÐÐÐÑÐÑÑÑ</translation>
     </message>
     <message>
+        <location filename="../control/stream.cpp" line="114"/>
         <source>Open</source>
         <translation>ÐÑÐÑÑÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/stream.cpp" line="115"/>
         <source>Failed</source>
         <translation>ÐÐÑÐÐÑÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/stream.cpp" line="116"/>
         <source>Closed</source>
         <translation>ÐÐÐÑÑÑÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/stream.cpp" line="118"/>
         <source>Unknown</source>
         <translation>ÐÐÐÐÐÐÑÑÐÑÐ</translation>
     </message>
     <message>
+        <location filename="../control/stream.cpp" line="117"/>
         <source>Retrying</source>
         <translation>ÐÐÐÑÑÐÐ</translation>
     </message>
@@ -1628,6 +2026,7 @@
 <context>
     <name>TorProcess</name>
     <message>
+        <location filename="../control/torprocess.cpp" line="93"/>
         <source>Process %1 failed to stop. [%2]</source>
         <translation>ÐÑÐÑÐÑÑ %1 ÐÐ ÑÐÐÐ ÐÑÑÐÐÐÐÐÑÑÑ. [%2]</translation>
     </message>
@@ -1635,10 +2034,12 @@
 <context>
     <name>TorService</name>
     <message>
+        <location filename="../control/torservice.cpp" line="155"/>
         <source>The Tor service is not installed.</source>
         <translation>ÐÐÑÐÐÑ Tor ÐÐ ÑÑÑÐÐÐÐÐÐÐ.</translation>
     </message>
     <message>
+        <location filename="../control/torservice.cpp" line="173"/>
         <source>Unable to start the Tor service.</source>
         <translation>ÐÐ ÑÐÐÐÐÑÑ ÐÐÐÑÑÑÐÑÑ ÑÐÑÐÐÑ Tor.</translation>
     </message>
@@ -1646,42 +2047,52 @@
 <context>
     <name>VMessageBox</name>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="88"/>
         <source>OK</source>
         <translation>ÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="89"/>
         <source>Cancel</source>
         <translation>ÐÑÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="90"/>
         <source>Yes</source>
         <translation>ÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="91"/>
         <source>No</source>
         <translation>ÐÐÑ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="92"/>
         <source>Help</source>
         <translation>ÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="93"/>
         <source>Retry</source>
         <translation>ÐÑÑ ÑÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="94"/>
         <source>Show Log</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÑÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="95"/>
         <source>Show Settings</source>
         <translation>ÐÐÐÐÐÐÑÑ ÐÐÑÑÑÐÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="96"/>
         <source>Continue</source>
         <translation>ÐÑÐÐÐÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../gui/common/vmessagebox.cpp" line="97"/>
         <source>Quit</source>
         <translation>ÐÑÐÑÐ</translation>
     </message>
@@ -1689,18 +2100,22 @@
 <context>
     <name>Vidalia</name>
     <message>
+        <location filename="../vidalia.cpp" line="230"/>
         <source>Invalid language code specified: </source>
         <translation>ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÐÐÐ ÑÐÑÐÐ: </translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="237"/>
         <source>Invalid GUI style specified: </source>
         <translation>ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÑÑÐÐÑ ÐÐÑÐÑÑÐÐÑÐ: </translation>
     </message>
     <message>
+        <location filename="../main.cpp" line="86"/>
         <source>Vidalia is already running</source>
         <translation>Vidalia ÑÐÐ ÐÐÐÑÑÐÐÐ</translation>
     </message>
     <message>
+        <location filename="../main.cpp" line="92"/>
         <source>Another Vidalia process is possibly already running. If there really is not another Vidalia process running, you can choose to continue anyway.
 
 Would you like to continue starting Vidalia?</source>
@@ -1709,50 +2124,62 @@
 ÐÑ ÑÐÑÐÑÐ ÐÑÐÐÐÐÐÐÑÑ ÐÐÐÑÑÐ Vidalia?</translation>
     </message>
     <message>
+        <location filename="../main.cpp" line="72"/>
         <source>Invalid Argument</source>
         <translation>ÐÐÐÐÑÐÑÐ ÐÐÑÐÐÐÑÑ</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="161"/>
         <source>Displays this usage message and exits.</source>
         <translation>ÐÐÐÐÐÑÐÐÐÑ ÑÑÐ ÑÐÐÐÑÐÐÐÐ Ð ÐÑÐÐÐÑÐÐÐÐÐÐÐ Ð ÐÐÐÐÑÑÐÐÑ ÑÐÐÐÑÑ.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="163"/>
         <source>Resets ALL stored Vidalia settings.</source>
         <translation>ÐÐÑÐÑÑÐÐÐÑ ÐÐÐ ÑÐÑÑÐÐÑÐÐÑÐ ÐÐÑÑÑÐÐÐÐ Vidalia.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="165"/>
         <source>Sets the directory Vidalia uses for data files.</source>
         <translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÐÐÑÐÐÐÐ ÐÐÑÐÑÑÐ Vidalia ÐÑÐÐÑ ÐÑÐÐÐÑÐÐÐÐÑÑ ÐÐÑ ÑÐÐÐÐÐ ÐÐÐÐÑÑ.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="167"/>
         <source>Sets the name and location of Vidalia&apos;s pidfile.</source>
         <translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÐÐÑ Ð ÐÑÑÑ Ð ÑÐÐÐÑ Ñ ÐÐÐÐÑÐÐ ÐÑÐÑÐÑÑÐ Vidalia.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="169"/>
         <source>Sets the name and location of Vidalia&apos;s logfile.</source>
         <translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÐÐÑ Ð ÐÑÑÑ Ð ÑÐÐÐÑ ÐÑÑÐÐÐÐ Vidalia.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="172"/>
         <source>Sets the verbosity of Vidalia&apos;s logging.</source>
         <translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÑÑÐÐÐÐÑ  ÑÐÐÐÑÐÐÐÐ (verbosity) Vidalia.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="175"/>
         <source>Sets Vidalia&apos;s interface style.</source>
         <translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÑÑÐÐÑ ÐÐÑÐÑÑÐÐÑÐ Vidalia.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="178"/>
         <source>Sets Vidalia&apos;s language.</source>
         <translation>ÐÑÑÐÐÐÐÐÐÐÐÐÑ ÑÐÑÐ Vidalia.</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="182"/>
         <source>Vidalia Usage Information</source>
         <translation>ÐÐÑÐÑÐÐÑÐÑ Ð ÐÑÐÐÐÑÐÐÐÐÐÐÐ Vidalia</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="243"/>
         <source>Invalid log level specified: </source>
         <translation> ÐÐÐÐÐÐ ÐÐÐÐÑÐÑÐ ÑÑÐÐÐÐÑ ÑÐÐÐÑÐÐÐÐ:</translation>
     </message>
     <message>
+        <location filename="../vidalia.cpp" line="249"/>
         <source>Unable to open log file &apos;%1&apos;: %2</source>
         <translation>ÐÐ ÑÐÐÐÐÑÑ ÐÑÐÑÑÑÑ ÑÐÐÐ &apos;%1&apos;: %2</translation>
     </message>

Modified: trunk/src/lang/vidalia_zh-cn.ts
===================================================================
--- trunk/src/lang/vidalia_zh-cn.ts	2007-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_zh-cn.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -774,7 +774,7 @@
         <translation>æçäæ: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>æçäæ: %1</translation>
     </message>
@@ -792,27 +792,27 @@
         <translation type="obsolete">åæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>åä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>éå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>æèåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>æææå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>åå</translation>
     </message>
@@ -822,136 +822,136 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>æä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>æç</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Vidalia åå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>åå Tor æåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>èæå Tor æåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>åæ Tor æåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia ææåæ Tor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>æååæåèåç</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>åçæååèåæåçéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia ææåçæååèå.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>ççåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>èå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>ææèä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>æææåèæåääåääåçèæ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>ååæèäåè</translation>
     </message>
@@ -976,125 +976,146 @@
         <translation type="obsolete">Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor æåèè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</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-05-03 09:38:09 UTC (rev 1723)
+++ trunk/src/lang/vidalia_zh-tw.ts	2007-05-10 04:41:00 UTC (rev 1724)
@@ -774,7 +774,7 @@
         <translation>éçèæ: </translation>
     </message>
     <message>
-        <location filename="../gui/log/logtreewidget.cpp" line="230"/>
+        <location filename="../gui/log/logtreewidget.cpp" line="235"/>
         <source>Messages Shown: %1</source>
         <translation>éçèæ: %1</translation>
     </message>
@@ -792,27 +792,27 @@
         <translation type="obsolete">åæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="356"/>
+        <location filename="../gui/mainwindow.ui" line="674"/>
         <source>About</source>
         <translation>éæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="369"/>
+        <location filename="../gui/mainwindow.ui" line="687"/>
         <source>Exit</source>
         <translation>çæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="230"/>
+        <location filename="../gui/mainwindow.ui" line="548"/>
         <source>Bandwidth Graph</source>
         <translation>æèåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="243"/>
+        <location filename="../gui/mainwindow.ui" line="561"/>
         <source>Message Log</source>
         <translation>èææè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="293"/>
+        <location filename="../gui/mainwindow.ui" line="611"/>
         <source>Help</source>
         <translation>åå</translation>
     </message>
@@ -822,136 +822,136 @@
         <translation type="obsolete">Ctrl+S</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="294"/>
+        <location filename="../gui/mainwindow.cpp" line="337"/>
         <source>Ctrl+T</source>
         <translation>Ctrl+T</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="295"/>
+        <location filename="../gui/mainwindow.cpp" line="338"/>
         <source>Ctrl+B</source>
         <translation>Ctrl+B</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="296"/>
+        <location filename="../gui/mainwindow.cpp" line="339"/>
         <source>Ctrl+L</source>
         <translation>Ctrl+L</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="298"/>
+        <location filename="../gui/mainwindow.cpp" line="341"/>
         <source>Ctrl+?</source>
         <translation>Ctrl+?</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="310"/>
+        <location filename="../gui/mainwindow.cpp" line="354"/>
         <source>File</source>
         <translation>ææ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="313"/>
+        <location filename="../gui/mainwindow.cpp" line="357"/>
         <source>Tor</source>
         <translation>Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="318"/>
+        <location filename="../gui/mainwindow.cpp" line="362"/>
         <source>View</source>
         <translation>æè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="325"/>
+        <location filename="../gui/mainwindow.cpp" line="371"/>
         <source>Vidalia Help</source>
         <translation>Vidalia åå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="434"/>
+        <location filename="../gui/mainwindow.cpp" line="503"/>
         <source>Error Starting Tor</source>
         <translation>åå Tor æççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <location filename="../gui/mainwindow.cpp" line="540"/>
         <source>Error Connecting to Tor</source>
         <translation>éæå Tor æççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="530"/>
+        <location filename="../gui/mainwindow.cpp" line="599"/>
         <source>Error Stopping Tor</source>
         <translation>åæ Tor æççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="559"/>
+        <location filename="../gui/mainwindow.cpp" line="628"/>
         <source>Tor Exited</source>
         <translation>Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="531"/>
+        <location filename="../gui/mainwindow.cpp" line="600"/>
         <source>Vidalia was unable to stop Tor.</source>
         <translation>Vidalia çæåæ Tor.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="500"/>
+        <location filename="../gui/mainwindow.cpp" line="569"/>
         <source>Server is Enabled</source>
         <translation>äæåæåèåç</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="297"/>
+        <location filename="../gui/mainwindow.cpp" line="340"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="587"/>
+        <location filename="../gui/mainwindow.cpp" line="656"/>
         <source>Error Applying Server Settings</source>
         <translation>æçäæåèåæççéè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="588"/>
+        <location filename="../gui/mainwindow.cpp" line="657"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
         <translation>Vidalia çææçäæåèå.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="505"/>
+        <location filename="../gui/mainwindow.cpp" line="574"/>
         <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="562"/>
+        <location filename="../gui/mainwindow.cpp" line="631"/>
         <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="437"/>
+        <location filename="../gui/mainwindow.cpp" line="506"/>
         <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="224"/>
+        <location filename="../gui/mainwindow.cpp" line="257"/>
         <source>Network Map</source>
         <translation>ççåå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="306"/>
+        <location filename="../gui/mainwindow.ui" line="624"/>
         <source>Settings</source>
         <translation>èå</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="650"/>
+        <location filename="../gui/mainwindow.cpp" line="719"/>
         <source>New Identity</source>
         <translation>ææèä</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="299"/>
+        <location filename="../gui/mainwindow.cpp" line="342"/>
         <source>Ctrl+I</source>
         <translation>Ctrl+I</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="653"/>
+        <location filename="../gui/mainwindow.cpp" line="722"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
         <translation>ææåçéæåæäåæäåçéæ.</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="672"/>
+        <location filename="../gui/mainwindow.cpp" line="741"/>
         <source>Failed to Create New Identity</source>
         <translation>ååæèäåæ</translation>
     </message>
@@ -976,125 +976,146 @@
         <translation type="obsolete">Tor ååæ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="359"/>
+        <location filename="../gui/mainwindow.cpp" line="410"/>
         <source>Tor is running</source>
         <translation>Tor æååè</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="159"/>
+        <location filename="../gui/mainwindow.ui" line="477"/>
         <source>Start Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="95"/>
+        <location filename="../gui/mainwindow.ui" line="390"/>
         <source>Tor is not running</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="353"/>
+        <location filename="../gui/mainwindow.cpp" line="403"/>
         <source>Tor is shutting down</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="360"/>
+        <location filename="../gui/mainwindow.cpp" line="411"/>
         <source>Stop Tor</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="373"/>
+        <location filename="../gui/mainwindow.cpp" line="424"/>
         <source>Tor is starting up</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="33"/>
+        <location filename="../gui/mainwindow.ui" line="298"/>
         <source>Vidalia Control Panel</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="63"/>
+        <location filename="../gui/mainwindow.ui" line="328"/>
         <source>Tor Status</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="135"/>
+        <location filename="../gui/mainwindow.ui" line="453"/>
         <source>Vidalia Shortcuts</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="169"/>
+        <location filename="../gui/mainwindow.ui" line="487"/>
         <source>Setup Relaying</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="172"/>
+        <location filename="../gui/mainwindow.ui" line="490"/>
         <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"/>
+        <location filename="../gui/mainwindow.ui" line="500"/>
         <source>View the Network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="185"/>
+        <location filename="../gui/mainwindow.ui" line="503"/>
         <source>View a map of the Tor network</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="198"/>
+        <location filename="../gui/mainwindow.ui" line="516"/>
         <source>Use a New Identity</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="201"/>
+        <location filename="../gui/mainwindow.ui" line="519"/>
         <source>Make subsequent connections appear new</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="233"/>
+        <location filename="../gui/mainwindow.ui" line="551"/>
         <source>View Tor&apos;s bandwidth usage</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="246"/>
+        <location filename="../gui/mainwindow.ui" line="564"/>
         <source>View Tor&apos;s log message history</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="296"/>
+        <location filename="../gui/mainwindow.ui" line="614"/>
         <source>View help documentation</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="309"/>
+        <location filename="../gui/mainwindow.ui" line="627"/>
         <source>Configure Tor and Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="359"/>
+        <location filename="../gui/mainwindow.ui" line="677"/>
         <source>View version and license information</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="372"/>
+        <location filename="../gui/mainwindow.ui" line="690"/>
         <source>Exit Vidalia</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="425"/>
+        <location filename="../gui/mainwindow.ui" line="743"/>
         <source>Show this window on startup</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="444"/>
+        <location filename="../gui/mainwindow.ui" line="762"/>
         <source>Hide</source>
         <translation type="unfinished"></translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.ui" line="447"/>
+        <location filename="../gui/mainwindow.ui" line="765"/>
         <source>Hide this window</source>
         <translation type="unfinished"></translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="264"/>
+        <source>Control Panel</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="343"/>
+        <source>Ctrl+P</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="401"/>
+        <source>Your Tor server is shutting down.
+Click &apos;Stop Tor&apos; again to force Tor to stop now.</source>
+        <translation type="unfinished"></translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="408"/>
+        <source>Stop Tor Now</source>
+        <translation type="unfinished"></translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>
Prev by Author: [vidalia-svn] r1725: Make the main window smaller when the user has no tray/dock (in trunk: . src/gui)
Next by Author: [vidalia-svn] r1727: Don't skip past the installation results immediately, since (trunk/pkg/win32)
Previous by thread: [vidalia-svn] r1725: Make the main window smaller when the user has no tray/dock (in trunk: . src/gui)
Next by thread: [vidalia-svn] r1726: Updated French translation file (trunk/src/lang)
Index(es):
- Author
- Thread