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

[vidalia-svn] r1518: Our Farsi translator said the first translation was not corr (trunk/src/lang)



Author: edmanm
Date: 2006-12-10 13:13:16 -0500 (Sun, 10 Dec 2006)
New Revision: 1518

Modified:
   trunk/src/lang/vidalia_fa.ts
Log:
Our Farsi translator said the first translation was not correct, so let's try
this one.


Modified: trunk/src/lang/vidalia_fa.ts
===================================================================
--- trunk/src/lang/vidalia_fa.ts	2006-12-10 12:20:53 UTC (rev 1517)
+++ trunk/src/lang/vidalia_fa.ts	2006-12-10 18:13:16 UTC (rev 1518)
@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+ï<?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 type="unfinished"></translation>
+        <translation>Arial</translation>
     </message>
 </context>
 <context>
@@ -13,7 +13,7 @@
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="290"/>
         <source>About Vidalia</source>
-        <translation>Vidalia ØØØØØÙ</translation>
+        <translation>ØØØØØÙ Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="344"/>
@@ -33,17 +33,17 @@
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="443"/>
         <source>Qt Version</source>
-        <translation>Qt ÙØØÙ</translation>
+        <translation>ÙØØÙ Qt</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="528"/>
         <source>Tor Version</source>
-        <translation>Tor ÙØØÙ</translation>
+        <translation>ÙØØÙ Tor</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.ui" line="359"/>
         <source>Vidalia Version</source>
-        <translation>Vidalia ÙØØÙ</translation>
+        <translation>ÙØØÙ Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/about/aboutdialog.cpp" line="79"/>
@@ -71,17 +71,17 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="390"/>
         <source>Start Tor with the specified configuration file (torrc)</source>
-        <translation>(torrc) ØØ ÙØÙÙØÙ ÙÛÚØØÙØÛ ØØÛÙ ØØÙ Tor ØØØØ</translation>
+        <translation>ØØØØ Tor ØØ ÙØÙÙØÙ ÙÛÚØØÙØÛ ØØÛÛÙ ØØÙ (torrc)</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="409"/>
         <source>Select path to Tor configuration file</source>
-        <translation>Tor ÚØÛØÙ ÙØÛØ ÙØÙÙØÙ ÙÛÚØØÙØÛ</translation>
+        <translation>ÚØÛØÙ ÙØÛØ ÙØÙÙØÙ ÙÛÚØØÙØÛ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="412"/>
         <source>Browse</source>
-        <translation>ÚØØ ÙÚØØØ</translation>
+        <translation>ÚØØ Ù ÚØØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="431"/>
@@ -91,27 +91,27 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="454"/>
         <source>Run as User:</source>
-        <translation>ØØÙØÙ ØÙ ØÙÙØÙ  ÚØØØØ</translation>
+        <translation>ØØÙØÙ ØÙ ØÙÙØÙ ÚØØØØ:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="467"/>
         <source>Vidalia will run with this User&apos;s permissions</source>
-        <translation>ØØ ØÛÙ ØØØØÙ ÙØÛ ÚØØØØ ØØØØ ØÙØÙØ ØØ Vidalia</translation>
+        <translation>Vidalia ØØ ØÛÙ ØØØØÙ ÙØÛ ÚØØØØ ØØØØ ØÙØÙØ ØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="487"/>
         <source>Run as Group:</source>
-        <translation>ØØÙØÙ ØÙ ØÙÙØÙ ÚØÙÙ</translation>
+        <translation>ØØÙØÙ ØÙ ØÙÙØÙ ÚØÙÙ:</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="494"/>
         <source>Vidalia will run with this Group&apos;s permissions</source>
-        <translation>ØØ ØÛÙ ØØØØÙ ÙØÛ ÚØÙÙ ØØØØ ØÙØÙØ ØØ Vidalia</translation>
+        <translation>Vidalia ØØ ØÛÙ ØØØØÙ ÙØÛ ÚØÙÙ ØØØØ ØÙØÙØ ØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="107"/>
         <source>Select Tor Configuration File</source>
-        <translation>Tor ÚØÛØÙ ÙØÙÙØÙ ÙÛÚØØÙØÛ</translation>
+        <translation>ÚØÛØÙ ÙØÙÙØÙ ÙÛÚØØÙØÛ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="120"/>
@@ -131,7 +131,7 @@
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="134"/>
         <source>Unable to create %1 [%2]</source>
-        <translation>ØÛØØØ 1% [2%] ÙØØØÙÛ ÙÛØØØØ</translation>
+        <translation>ØÛØØØ %1 [%2] ÙØØØÙÛ ÙÛØØØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="515"/>
@@ -141,44 +141,44 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="530"/>
         <source>Enable this if you wish to run Tor as a Windows service</source>
-        <translation>ØØØØ ÚÙÛØ Windows ØØ ØØÙÙØÙ ØØÙÛØ Tor ØÛÙØØ ØØ ØÛÚ ØØÙÛØ ØÚØ ÙÛØÙØÙÛØ</translation>
+        <translation>ØÚØ ÙÛØÙØÙÛØ Tor ØØ ØØÙÙØÙ ØØÙÛØ Windows ØØØØ ÚÙÛØ ØÛÙØØ ØØ ØÛÚ ØØÙÛØ</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="533"/>
         <source>Run Tor in the background as a Windows service</source>
-        <translation>Windows ØØ ØÙÛÙÙ ØÙ ØÙÙØÙ ØØÙÛØ Tor ØØÙØÙ</translation>
+        <translation>ØØÙØÙ Tor ØØ ØÙÛÙÙ ØØÙÙØÙ ØØÙÛØ Windows</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="157"/>
         <source>Unable to remove Tor Service</source>
-        <translation>ÙØØØÙÛ ÙÛØØØØ Tor ÙØÚ ÚØØÙ ØØÙÛØ</translation>
+        <translation>ÙØÚ ÚØØÙ ØØÙÛØ Tor ÙØØØÙÛ ÙÛØØØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="168"/>
         <source>Unable to install Tor Service</source>
-        <translation>ÙØØØÙÛ ÙÛØØØØ Tor ÚØØ ÚØØØÛ ØØÙÛØ</translation>
+        <translation>ÚØØÚØØØÛ ØØÙÛØ Tor ÙØØØÙÛ ÙÛØØØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="169"/>
         <source>Vidalia was unable to install the Tor service.</source>
-        <translation>ØØ ÚØØÚØØØÛ ÚÙØ Tor ÙØÙØÙØØ ØØÙÛØ Vidalia</translation>
+        <translation>Vidalia ÙØÙØÙØØ ØØÙÛØ Tor ØØ ÚØØÚØØØÛ ÚÙØ.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="159"/>
         <source>Vidalia was unable to remove the Tor service.
 
 You may need to remove it manually.</source>
-        <translation>ØØ ÙØÚ ÚÙØ. ØÙØ ÙÛ ØØÛØØ ØÙ ØØ ØÙ ÚÙÙÙ ØØØÛ ÙØÚ ÚÙÛØ Tor ÙØÙØÙØØ ØØÙÛØ Vidalia</translation>
+        <translation>Vidalia ÙØÙØÙØØ ØØÙÛØ Tor ØØ ÙØÚ ÚÙØ. ØÙØ ÙÛ ØØÛØØ ØÙ ØØ ØÚÙÙÙ ØØØÛ ÙØÚ ÚÙÛØ.</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="369"/>
         <source>Tor Configuration File</source>
-        <translation>Tor ÙØÙÙØÙ ÙÛÚØØÙØÛ</translation>
+        <translation>ÙØÙÙØÙ ÙÛÚØØÙØÛ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="338"/>
         <source>Port that Vidalia uses to communicate with Tor.</source>
-        <translation type="unfinished"></translation>
+        <translation>ØØÚØÙÛ ÚÙ Vidalia ØØØÛ ØÙØØ ØØ Tor ØÚØØ ÙÛ ØØØ.</translation>
     </message>
 </context>
 <context>
@@ -191,12 +191,12 @@
     <message>
         <location filename="../gui/config/appearancepage.ui" line="322"/>
         <source>Choose the language used in Vidalia</source>
-        <translation>Vidalia ÚØÛØÙ ØØØÙ ØÚØØØÙØÙ ØØ</translation>
+        <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>!ØØ ØÙØÙØ ØØØ Vidalia ØØØØØÛÛ ØØØÙ ØÙÙØ ÙØ ØØ ØØÙ ØÙØØØÛ ØÙØØØÙ</translation>
+        <translation>ØØØØØÛÛ ØØØÙ ØÙÙØ ÙØ ØØ ØØÙ ØÙØØØÛ ØÙØØØÙ Vidalia ØØ ØÙØÙØ ØØØ!</translation>
     </message>
     <message>
         <location filename="../gui/config/appearancepage.ui" line="370"/>
@@ -206,7 +206,7 @@
     <message>
         <location filename="../gui/config/appearancepage.ui" line="404"/>
         <source>Choose Vidalia&apos;s interface style</source>
-        <translation>Vidalia ÚØÛØÙ ØØÚ ÙÙØÛØ</translation>
+        <translation>ÚØÛØÙ ØØÚ ÙÙØÛØ Vidalia</translation>
     </message>
 </context>
 <context>
@@ -214,12 +214,12 @@
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="289"/>
         <source>Tor Bandwidth Usage</source>
-        <translation>Tor ÙÙÙØÛ ØØÙØ ØÚØØ ØØØÙ ØØÙ ØØØØ</translation>
+        <translation>ÙÙÙØÛ ØØÙØ ØÚØØØØØÙ ØØÙ ØØØØ Tor</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="313"/>
         <source>Show Settings</source>
-        <translation>ÙÙØÛØ  ÙØØØÙØØÙØ Ù ØÙØÛÙØØ</translation>
+        <translation>ÙÙØÛØ ØÙØÛÙØØ Ù ÙØØØÙØØÙØ</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="336"/>
@@ -254,7 +254,7 @@
     <message>
         <location filename="../gui/bwgraph/bwgraph.cpp" line="156"/>
         <source>Since:</source>
-        <translation>:ØØ</translation>
+        <translation>ØØ:</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="539"/>
@@ -264,12 +264,12 @@
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="554"/>
         <source>% Opaque</source>
-        <translation>ØØØ %</translation>
+        <translation>% ØØØ</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/bwgraph.cpp" line="220"/>
         <source>Hide Settings</source>
-        <translation>ÙÙÙØÙ ÚØØÙ  ÙØØØÙØØÙØ Ù ØÙØÛÙØØ</translation>
+        <translation>ÙÙÙØÙ ÚØØÙ ØÙØÛÙØØ Ù ÙØØØÙØØÙØ</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="474"/>
@@ -287,12 +287,12 @@
     <message>
         <location filename="../control/circuit.cpp" line="110"/>
         <source>Open</source>
-        <translation>ØØØ ÚØØÙ</translation>
+        <translation>ØØØÚØØÙ</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="111"/>
         <source>Building</source>
-        <translation>ØØ ØØÙ ØØØØÙ</translation>
+        <translation>ØØØØÙ ØØØØÙ</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="112"/>
@@ -321,30 +321,25 @@
 <context>
     <name>CircuitListWidget</name>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="46"/>
         <source>Connection</source>
         <translation>ØØØØÙ</translation>
     </message>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="47"/>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="46"/>
         <source>Status</source>
         <translation>ÙØØÛØ</translation>
     </message>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="56"/>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="54"/>
         <source>Close Circuit</source>
         <translation>ØØØÙ ÙØØØ</translation>
     </message>
     <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="62"/>
+        <location filename="../gui/network/circuitlistwidget.cpp" line="58"/>
         <source>Close Stream</source>
         <translation>ØØØÙ ØØÛØÙ</translation>
     </message>
-    <message>
-        <location filename="../gui/network/circuitlistwidget.cpp" line="55"/>
-        <source>Zoom to Circuit</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>ConfigDialog</name>
@@ -381,7 +376,7 @@
     <message>
         <location filename="../gui/config/configdialog.cpp" line="154"/>
         <source>Error Saving Configuration</source>
-        <translation>ØØØ ÙÙÚØÙ ØØØ ÙÛÚØØÙØÛ</translation>
+        <translation>ØØØ ØØ ÙÙÚØÙ ØØØ ÙÛÚØØÙØÛ</translation>
     </message>
     <message>
         <location filename="../gui/config/configdialog.cpp" line="74"/>
@@ -391,7 +386,7 @@
     <message>
         <location filename="../gui/config/configdialog.ui" line="289"/>
         <source>Settings</source>
-        <translation>ÙØØØÙØØÙØ Ù ØÙØÛÙØØ</translation>
+        <translation>ØÙØÛÙØØ Ù ÙØØØÙØØÙØ</translation>
     </message>
 </context>
 <context>
@@ -412,61 +407,56 @@
     <message>
         <location filename="../control/controlsocket.cpp" line="61"/>
         <source>Error connecting to %1:%2 [%3]</source>
-        <translation>[%3] %2:%1 ØØØ ÙÙÚØÙ ØØØØÙ ØÙ</translation>
+        <translation>ØØØ ØØ ÙÙÚØÙ ØØØØÙ ØÙ %1:%2 [%3]</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="95"/>
+        <location filename="../control/controlsocket.cpp" line="74"/>
+        <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 ÙÛØØ ØØ). ØØØÙØ ØÙ ÛÚ ÙØØÙ ØØÛØØØ Tor.</translation>
+    </message>
+    <message>
+        <location filename="../control/controlsocket.cpp" line="89"/>
         <source>Error disconnecting socket. [%1]</source>
-        <translation>[%1] .ØØØ ÙÙÚØÙ ØØØÙ ØØØØÙ ØÙÚØ</translation>
+        <translation>ØØØ ÙÙÚØÙ ØØØÙ ØØØØÙ ØÙÚØ. [%1]</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="151"/>
+        <location filename="../control/controlsocket.cpp" line="145"/>
         <source>Error sending control command. [%1]</source>
-        <translation>[%1] .ØØØ ÙÙÚØÙ ÙØØØØØÙ ÙØÙØÙ ÚÙØØÙ</translation>
+        <translation>ØØØ ÙÙÚØÙ ÙØØØØØÙ ÙØÙØÙ ÚÙØØÙ. [%1]</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="188"/>
+        <location filename="../control/controlsocket.cpp" line="182"/>
         <source>Socket disconnected while attempting to read a line of data.</source>
-        <translation>.ØÙÚØ ÙÙÚØÙ ØÙØÙØÙ ÛÚ ØØÛÙ ØØ ØØØÙ ÙØ ØØØÙ ØØ</translation>
+        <translation>ØÙÚØ ÙÙÚØÙ ØÙØÙØÙ ÛÚ ØØÛÙ ØØ ØØØÙ ÙØ ØØØÙ ØØ.</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="226"/>
+        <location filename="../control/controlsocket.cpp" line="220"/>
         <source>Invalid control reply. [%1]</source>
-        <translation>[%1] .ÙØØØ ÙØÙØÙ ÙØØØØØ ÙÛØØØØ</translation>
+        <translation>ÙØØØ ÙØÙØÙ ÙØØØØØ ÙÛ ØØØØ. [%1]</translation>
     </message>
     <message>
-        <location filename="../control/controlsocket.cpp" line="142"/>
+        <location filename="../control/controlsocket.cpp" line="136"/>
         <source>Control socket is not connected.</source>
-        <translation>.ØÙÚØ ÚÙØØÙ ÙØØÙ ÙÙÛ ØØØØ</translation>
+        <translation>ØÙÚØ ÚÙØØÙ ÙØØÙ ÙÙÛ ØØØØ.</translation>
     </message>
-    <message>
-        <location filename="../control/controlsocket.cpp" line="76"/>
-        <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 type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../control/controlsocket.cpp" line="80"/>
-        <source>Vidalia only supports Version 1 of Tor&apos;s control protocol (version %1 detected).
-Upgrade to a newer version of Tor.</source>
-        <translation type="unfinished"></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>Tor ÙØÛØ ÙØÙÙØÙ ØØØØÛÛ</translation>
+        <translation>ÙØÛØ ÙØÙÙØÙ ØØØØÛÛ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="353"/>
         <source>Select path to Tor executable</source>
-        <translation>Tor ÚØÛØÙ ÙØÛØ ÙØÙÙØÙ ØØØØÛÛ</translation>
+        <translation>ÚØÛØÙ ÙØÛØ ÙØÙÙØÙ ØØØØÛÛ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="356"/>
         <source>Browse</source>
-        <translation>ÚØØ ÙÚØØØ</translation>
+        <translation>ÚØØ Ù ÚØØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="375"/>
@@ -476,37 +466,37 @@
     <message>
         <location filename="../gui/config/generalpage.ui" line="390"/>
         <source>Select to start Vidalia on system boot</source>
-        <translation>ØØ ÙÙÚØÙ ØØÙ ØÙØØØÛ ØÛØØÙ Vidalia ÚØÛØÙ ØØØÛ ØØÙ ØÙØØØÛ ÚØØÙ</translation>
+        <translation>ÚØÛØÙ ØØØÛ ØØÙ ØÙØØØÛ ÚØØÙ Vidalia ØØ ÙÙÚØÙ ØØÙ ØÙØØØÛ ØÛØØÙ</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="393"/>
         <source>Run Vidalia on system startup</source>
-        <translation>ØØ ÙÙÚØÙ ØØÙ ØÙØØØÛ ØÛØØÙ Vidalia ØØØØ ÚØØÙ</translation>
+        <translation>ØØØØ ÚØØÙ Vidalia ØØ ÙÙÚØÙ ØØÙ ØÙØØØÛ ØÛØØÙ</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="406"/>
         <source>Set to start Tor when you launch Vidalia</source>
-        <translation>Vidalia ØØ ÙÙÚØÙ ØØÙ ØÙØØØÛ Tor ÚØÛØÙ ØØØÛ ØØØØ ÚØØÙ</translation>
+        <translation>ÚØÛØÙ ØØØÛ ØØØØ ÚØØÙ Tor ØØ ÙÙÚØÙ ØØÙ ØÙØØØØÙ Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="409"/>
         <source>Start Tor when Vidalia starts</source>
-        <translation>ØØØØ ÙÛ ØÙØ Vidalia ØØ ÙÙÚØÙÛ ÚÙ Tor ØØØØ ÚØØÙ</translation>
+        <translation>ØØØØ ÚØØÙ Tor ÙÙÚØÙÛ ÚÙ Vidalia ØØØØ ÙÛ ØÙØ</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.cpp" line="72"/>
         <source>Select Path to Tor</source>
-        <translation>Tor ÚØÛØÙ ÙØÛØ</translation>
+        <translation>ÚØÛØÙ ÙØÛØ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="307"/>
         <source>Tor Executable</source>
-        <translation>Tor ÙØÙÙØÙ ØØØØÛÛ</translation>
+        <translation>ÙØÙÙØÙ ØØØØÛÛ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.cpp" line="63"/>
         <source>Executables (*.exe)</source>
-        <translation>(*.exe) ÙØÙÙØÙ ÙØÛ ØØØØÛÛ</translation>
+        <translation>ÙØÙÙØÙ ÙØÛ ØØØØÛÛ (exe.*)</translation>
     </message>
 </context>
 <context>
@@ -514,12 +504,12 @@
     <message>
         <location filename="../gui/bwgraph/graphframe.cpp" line="250"/>
         <source>Recv: </source>
-        <translation>:ØØÛØÙØ</translation>
+        <translation>ØØÛØÙØ:</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/graphframe.cpp" line="259"/>
         <source>Sent: </source>
-        <translation>:ØØØØÙ</translation>
+        <translation>ØØØØÙ: </translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/graphframe.cpp" line="271"/>
@@ -534,7 +524,7 @@
     <message>
         <location filename="../gui/bwgraph/graphframe.cpp" line="277"/>
         <source>%1 GB</source>
-        <translation>%1 ÚÛÚØ ØØÛØ</translation>
+        <translation>%1 ÚÛÚØØØÛØ</translation>
     </message>
     <message>
         <location filename="../gui/bwgraph/graphframe.cpp" line="298"/>
@@ -547,17 +537,17 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="303"/>
         <source>Vidalia Help</source>
-        <translation>Vidalia ØØÙÙÙØÛ</translation>
+        <translation>ØØÙÙÙØÛ Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="449"/>
         <source>Find Previous</source>
-        <translation>ÙÛØØÚØØÙ ÙÛØÛÙ</translation>
+        <translation>ÙÛØØ ÚØØÙ ÙÛØÛÙ</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="462"/>
         <source>Find Next</source>
-        <translation>ÙÛØØÚØØÙ ÙØÛÙ</translation>
+        <translation>ÙÛØØ ÚØØÙ ÙØÛÙ</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="496"/>
@@ -582,7 +572,7 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="680"/>
         <source>Found Documents</source>
-        <translation>ØÙØ ÙØÛ ÙÛØØØØÙ</translation>
+        <translation>ØÙØÙØÛ ÙÛØØ ØØÙ</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="759"/>
@@ -592,7 +582,7 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="762"/>
         <source>Move to previous page (Backspace)</source>
-        <translation>(Backspace) ØØÚÙ ÙÛØÛÙ</translation>
+        <translation>ØØÚÙ ÙÛØÛÙ (Backspace)</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="770"/>
@@ -607,7 +597,7 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="781"/>
         <source>Move to next page (Shift+Backspace)</source>
-        <translation>(Shift+Backspace) ØØÚÙ ÙØÛÙ</translation>
+        <translation>ØØÚÙ ÙØÛÙ (Shift+Backspace)</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="789"/>
@@ -622,7 +612,7 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="800"/>
         <source>Move to the Home page (Ctrl+H)</source>
-        <translation>(Ctrl+H) ØÙØÙ ØÙ ØØÚÙ ØØÙÛ</translation>
+        <translation>ØÙØÙ ØÙ ØØÚÙ ØØÙÛ (Ctrl+H)</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="808"/>
@@ -632,12 +622,12 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="825"/>
         <source>Find</source>
-        <translation>ÙÛØØÚØØÙ</translation>
+        <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>
+        <translation>ÙÛØØ ÚØØÙ ÛÚ ÙØÚÙ ÛØ ØØØØØ ØØ ØÛÙ ØØÚÙ (Ctrl+F)</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="836"/>
@@ -652,17 +642,17 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="847"/>
         <source>Close Vidalia Help</source>
-        <translation>Vidalia ØØØÙ ØØÙÙÙØÛ</translation>
+        <translation>ØØØÙ ØØÙÙÙØÛ Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="855"/>
         <source>Esc</source>
-        <translation>Esc ÚÙÛØ ÚØÛØ</translation>
+        <translation>ÚÙÛØ ÚØÛØ Esc</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="121"/>
         <source>Error Loading Help Contents: </source>
-        <translation>:ØØØ ÙÙÚØÙ ØØØÚØØØÛ ÙØÙØÙØÙ ØØÙÙÙØ</translation>
+        <translation>ØØØ ÙÙÚØÙ ØØØÚØØØÛ Ù ØÙØÙØÙ ØØÙÙÙØ:</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="372"/>
@@ -682,7 +672,7 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="427"/>
         <source>Find:</source>
-        <translation>:ÙÛØØÚØØÙ</translation>
+        <translation>ÙÛØØÚØØÙ:</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="506"/>
@@ -692,12 +682,12 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="637"/>
         <source>Searching for:</source>
-        <translation>:ØØØØÙ ØØØÛ</translation>
+        <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>
+        <translation>ÙØØÙØ ØÙØ XML ÙØØØ ØØÙ ÙØØØØ ÙÙÛ ØØØØ.</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.cpp" line="421"/>
@@ -710,7 +700,7 @@
     <message>
         <location filename="../gui/help/browser/helptextbrowser.cpp" line="59"/>
         <source>Error opening help file: </source>
-        <translation> :ØØØ ÙÙÚØÙ ØØØÚØØÙ ÙØÙÙØÙ ØØÙÙÙØ</translation>
+        <translation>ØØØ ÙÙÚØÙ ØØØ ÚØØÙ ÙØÙÙØÙ ØØÙÙÙØ: </translation>
     </message>
 </context>
 <context>
@@ -751,22 +741,17 @@
     <message>
         <location filename="../gui/log/logtreewidget.cpp" line="40"/>
         <source>Messages Shown: </source>
-        <translation>:ÙÛØÙÙØÛ ÙØØÙ ØØØÙ ØØÙ</translation>
+        <translation>ÙÛØÙÙØÛ ÙØØÙ ØØØÙ ØØÙ:</translation>
     </message>
     <message>
         <location filename="../gui/log/logtreewidget.cpp" line="230"/>
         <source>Messages Shown: %1</source>
-        <translation>%1 :ÙÛØÙÙØÛ ÙØØÙ ØØØÙ ØØÙ</translation>
+        <translation>ÙÛØÙÙØÛ ÙØØÙ ØØØÙ ØØÙ: %1</translation>
     </message>
 </context>
 <context>
     <name>MainWindow</name>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="239"/>
-        <source>Tor is Stopped</source>
-        <translation>ØÛØØØØÙ ØØØ Tor</translation>
-    </message>
-    <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
         <source>Start</source>
         <translation>ØØØØ</translation>
@@ -844,59 +829,39 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="318"/>
         <source>Vidalia Help</source>
-        <translation>Vidalia ØØÙÙÙØÛ</translation>
+        <translation>ØØÙÙÙØÛ Vidalia</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="365"/>
         <source>Error Starting Tor</source>
-        <translation>Tor ØØØ ØØ ÙÙÚØÙ ØØØØ</translation>
+        <translation>ØØØ ØØ ÙÙÚØÙ ØØØØ Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="409"/>
         <source>Error Connecting to Tor</source>
-        <translation>Tor ØØØ ØØ ÙÙÚØÙ ØØØØÙ ØÙ</translation>
+        <translation>ØØØ ØØ ÙÙÚØÙ ØØØØÙ ØÙ Tor</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="474"/>
         <source>Error Stopping Tor</source>
-        <translation>Tor ØØØ ØØ ÙÙÚØÙ ØÛØØØÙØÙ</translation>
+        <translation>ØØØ ØØ ÙÙÚØÙ ØÛØØØÙØÙ Tor</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="495"/>
-        <source>Tor is stopped</source>
-        <translation>ØÛØØØØÙ ØØØ Tor</translation>
-    </message>
-    <message>
         <location filename="../gui/mainwindow.cpp" line="507"/>
         <source>Tor Exited</source>
-        <translation>ØÛØÙÙ ØØ Tor</translation>
+        <translation>Tor ØÛØÙÙ ØØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="475"/>
         <source>Vidalia was unable to stop Tor.</source>
-        <translation>.ØØ ØØÛØØØÙØ Tor ÙØÙØÙØØ Vidalia</translation>
+        <translation>Vidalia ÙØÙØÙØØ Tor ØØ ØØÛØØØÙØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="394"/>
-        <source>Tor is starting</source>
-        <translation>ØØ ØØÙ ØØÙ ØÙØØØÙ ÙÛ ØØØØ Tor</translation>
-    </message>
-    <message>
-        <location filename="../gui/mainwindow.cpp" line="529"/>
-        <source>Tor is running</source>
-        <translation>ØØ ØØÙ ØØØØ ÙÛ ØØØØ Tor</translation>
-    </message>
-    <message>
         <location filename="../gui/mainwindow.cpp" line="435"/>
         <source>Server is Enabled</source>
         <translation>ØØÙÛØ ØÙÙØÙ ÙØØÙ ÙÛ ØØØØ</translation>
     </message>
     <message>
-        <location filename="../gui/mainwindow.cpp" line="471"/>
-        <source>Tor is stopping</source>
-        <translation>ØØ ØØÙ ØÛØØØØÙ ÙÛ ØØØØ Tor</translation>
-    </message>
-    <message>
         <location filename="../gui/mainwindow.cpp" line="289"/>
         <source>Ctrl+N</source>
         <translation>Ctrl+N</translation>
@@ -904,31 +869,31 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="537"/>
         <source>Error Applying Server Settings</source>
-        <translation>ØØØ ØØ ÙÙÚØÙ ØÚØØ ØØØÙ ØÙØÛÙØØ ØØÙÛØ ØÙÙØÙ</translation>
+        <translation>ØØØ ØØ ÙÙÚØÙ ØÚØØØØØÙ ØÙØÛÙØØ ØØÙÛØ ØÙÙØÙ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="538"/>
         <source>Vidalia was unable to apply your server&apos;s settings.</source>
-        <translation>.ÙØÙØÙØØ ØÙØÛÙØØ ØØÙÛØ ØÙÙØÙ ØØ ØÚØØ ØØØØ Vidalia</translation>
+        <translation>Vidalia ÙØÙØÙØØ ØÙØÛÙØØ ØØÙÛØ ØÙÙØÙ ØØ ØÚØØ ØØØØ.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="440"/>
         <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>
+        <translation>ÙÙ ØÚÙÙÙ Tor ØØ ØØÙØ ØØÙÛØ ØÙÙØÙ ÙÛ ØØØØ. ØÛØØØÙØÙ ØØÙÛØ ØÙÙØÙ ØÙØ ÙØÛÙ ÙÙÙÙ ØØ ØØØØÙ ÚØØØØØÙ ØÛÚØ ØÙØÙØ ØØ. ØÛØ ÙÛØÙØÙÛØ ØÙ ÚÙÙÙ ÙÙØØØ ØØÛØØÛØ Ù ØÙ ØÛÚØ ÚØØØØØÙ ØÙØÙ ÙÛØØ ÚØØÙ ÛÚ ØØÙÛØ ØÙÙØÙ ØØÛØ ØØ ØØÙÛØØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="510"/>
         <source>Vidalia detected that Tor exited unexpectedly.
 
 Please check the message log for indicators about what happened to Tor before it exited.</source>
-        <translation>.ØØØØÛ ÚÙÛØ Tor ØÙ ÚÙÙÙ ØÛØÙÙØØØÙ ØÛØÙÙ ØØ. ØÙØÙØÙÙØ ØØØ ÙØÙÙØÙ ØØØ ÙÛØÙ ØØ ØØØÛ ØØØØÛÙÛ ØÙÛØØØÙØÛ ÙÛØ ØØ ØÛØÙÙ ØÙØÙ Tor ÙÛ ØØØ ÚÙ Vidalia</translation>
+        <translation>Vidalia ÙÛ ØØØ ÚÙ Tor ØÙ ÚÙÙÙ ØÛØÙÙØØØÙ ØÛØÙÙ ØØ. ØÙØÙØÙÙØ ØØØ ÙØÙÙØÙ ØØØ ÙÛØÙ ØØ ØØØÛ ØØØØÛÙÛ ØÙÛØØØÙØÛ ÙÛØ ØØ ØÛØÙÙ ØÙØÙ Tor ØØØØÛ ÚÙÛØ.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="368"/>
         <source>Vidalia was unable to start Tor. Check your settings to ensure the correct name and location of your Tor executable is specified.</source>
-        <translation>.ØØØØØÛ ÙØØØ ØØÙ ØÙØ Tor ØØ ØØÙ ØÙØØØÛ ÚÙØ. ØÙØÛÙØØØØÙ ØØ ÚÚ ÚÙÛØ Ù ØØÙÛÙØÙ ÙÛØØ ÚÙÛØ ÚÙ ÙØÙ Ù ÙØÛØ ÙØÙÙØÙ ØØØØÛÛ Tor ÙØÙØÙØØ Vidalia</translation>
+        <translation>Vidalia ÙØÙØÙØØ Tor ØØ ØØÙ ØÙØØØÛ ÚÙØ. ØÙØÛÙØØØØÙ ØØ ÚÚ ÚÙÛØ Ù ØØÙÛÙØÙ ÙÛØØ ÚÙÛØ ÚÙ ÙØÙ Ù ÙØÛØ ÙØÙÙØÙ ØØØØÛÛ Tor ØØØØØÛ ÙØØØ ØØÙ ØÙØ.</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="213"/>
@@ -938,7 +903,7 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="217"/>
         <source>Settings</source>
-        <translation>ÙØØØÙØØÙØ Ù ØÙØÛÙØØ</translation>
+        <translation>ØÙØÛÙØØ Ù ÙØØØÙØØÙØ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="571"/>
@@ -953,13 +918,38 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="574"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
-        <translation>.ÙÙÙ ØØØØÙ ÙØÛ ÙØÛÙ ØÙØØ ÙØÙØÙØ ØÙØÙÙØ ØÙØ ÙØØØ ØÙ ØØØØÙ ÙØÛ ÙÛØÛÙ</translation>
+        <translation>ÙÙÙ ØØØØÙ ÙØÛ ÙØÛÙ ØÙØØ ÙØÙØÙØ ØÙØÙÙØ ØÙØ ÙØØØ ØÙ ØØØØÙ ÙØÛ ÙÛØÛÙ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Failed to Create New Identity</source>
         <translation>ÙØÚØÙÛ ØØ ÙØÛØ ØÙØØÙ ÙÙÛØ ØØØÙ</translation>
     </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="239"/>
+        <source>Tor is Stopped</source>
+        <translation>Tor ØÛØØØØÙ ØØØ</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="471"/>
+        <source>Tor is stopping</source>
+        <translation>Tor ØØ ØØÙ ØÛØØØØÙ ÙÛ ØØØØ</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="394"/>
+        <source>Tor is starting</source>
+        <translation>Tor ØØ ØØÙ ØØÙ ØÙØØØÙ ÙÛ ØØØØ</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="495"/>
+        <source>Tor is stopped</source>
+        <translation>Tor ØÛØØØØÙ ØØØ</translation>
+    </message>
+    <message>
+        <location filename="../gui/mainwindow.cpp" line="529"/>
+        <source>Tor is running</source>
+        <translation>Tor ØØ ØØÙ ØØØØ ÙÛ ØØØØ</translation>
+    </message>
 </context>
 <context>
     <name>MessageLog</name>
@@ -996,7 +986,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="433"/>
         <source>Save Settings</source>
-        <translation>ØØØ ÚØØÙ ØÙØÛÙØØ Ù ÙØØØÙØØÙØ</translation>
+        <translation>ØØØ ÚØØÙ ØÙØÛÙØØ Ù ÙØØØÙØØÙØ</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="449"/>
@@ -1041,7 +1031,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="727"/>
         <source>Message Filters...</source>
-        <translation>...ÙÛÙØØÙØ</translation>
+        <translation>ÙÛÙØØÙØ...</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="730"/>
@@ -1051,7 +1041,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="743"/>
         <source>History Size...</source>
-        <translation>...ØØÛØ ØØØÛØÚÙ</translation>
+        <translation>ØØÛØ ØØØÛØÚÙ</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="746"/>
@@ -1066,7 +1056,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="765"/>
         <source>Clear all messages from the Message Log (Ctrl+E)</source>
-        <translation>(Ctrl+E) ÙØÚ ÚØØÙ ÙÙÙ ÙÛØÙ ÙØ ØØ ÙØÙÙØÙ ØØØ ÙÛØÙ</translation>
+        <translation>ÙØÚ ÚØØÙ ÙÙÙ ÙÛØÙ ÙØ ØØ ÙØÙÙØÙ ØØØ ÙÛØÙ (Ctrl+E)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="773"/>
@@ -1081,7 +1071,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="790"/>
         <source>Copy the selected messages to the clipboard (Ctrl+C)</source>
-        <translation>(Ctrl+C) ÚÙÛ ÚØØÙ ÙÛØÙ ÙØÛ ØØÚØÛØÙ ØÙ ØØØÙ ÛØØØØØØ</translation>
+        <translation>ÚÙÛ ÚØØÙ ÙÛØÙ ÙØÛ ØØÚØÛØÙ ØÙ ØØØÙ ÛØØØØØØ (Ctrl+C)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="798"/>
@@ -1096,7 +1086,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="812"/>
         <source>Select all messages (Ctrl+A)</source>
-        <translation>(Ctrl+A) ÚØÛØÙ ÙÙÙ ÙÛØÙ ÙØ</translation>
+        <translation>ÚØÛØÙ ÙÙÙ ÙÛØÙ ÙØ (Ctrl+A)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="820"/>
@@ -1136,7 +1126,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="912"/>
         <source>Esc</source>
-        <translation>Esc ÚÙÛØ ÚØÛØ</translation>
+        <translation>ÚÙÛØ ÚØÛØ Esc</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="923"/>
@@ -1146,7 +1136,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="926"/>
         <source>Find all messages containing the search text (Ctrl+F)</source>
-        <translation>(Ctrl+F) ÙÛØØ ÚØØÙ ÙÙÙ ÙÛØÙ ÙØÛÛ ÚÙ ØÛÙ ÙØÙ ØØ ØØ ØØØØØÙØ</translation>
+        <translation>ÙÛØØ ÚØØÙ ÙÙÙ ÙÛØÙ ÙØÛÛ ÚÙ ØÛÙ ÙØÙ ØØ ØØ ØØ ØØØÙØ (Ctrl+F)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="934"/>
@@ -1157,13 +1147,13 @@
         <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>
+        <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>
+        <translation>ÙÛØÙÙØÛÛ ÚÙ ÙØÛØØØ ÙÛØÙÙØ ØÙÙØ ÙÙÚØÙÛ ÚÙ ÚÛØÛ ØØ ØØØØ ØØ ØØ Tor.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="154"/>
@@ -1171,19 +1161,19 @@
 during normal Tor operation and are 
 not considered errors, but you may 
 care about.</source>
-        <translation>.Ù ØØÙÙØÙ ØØØ ØØÙØØÚØÙØÙ ÙÙÛØÙÙØ, ÙÙÛ ØÙ ØÙÙØ ØÙØÙ ÚÙÛØ Tor ÙÛØÙ ÙØÛ ÙØØØÛ ÚÙ ÙØÛØØØ ÙÛØÙÙØ ÙÙÚØÙ ØØØØÛ ÙØÙØÙ</translation>
+        <translation>ÙÛØÙ ÙØÛ ÙØØØÛ ÚÙ ÙØÛØØØ ÙÛØÙÙØ ÙÙÚØÙ ØØØØÛ ÙØÙØÙ Tor Ù ØØÙÙØÙ ØØØ ØØ ÙØØ ÚØÙØÙ ÙÙÛØÙÙØØ ÙÙÛ ØÙ ØÙÙØ ØÙØÙ ÚÙÛØ.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="156"/>
         <source>Messages that appear frequently 
 during normal Tor operation.</source>
-        <translation>.Tor ÙÛØÙ ÙØÛÛ ÚÙ ØØØÙØ ÙØÛØØØ ÙÛØÙÙØ ÙÙÚØÙ ØØØØÛ ÙØÙØÙ</translation>
+        <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>.Tor ÙÛØÙ ÙØÛ ÙØÚÙ ØÙ ÙÛÚÙ ÙÙØØ ØÙØÙ ØØØÛ ØØØÙØÚØÙ ØØÙØÙÙ</translation>
+        <translation>ÙÛØÙ ÙØÛ ÙØÚÙ ØÙ ÙÛÚÙ ÙÙØØ ØÙØÙ ØØØÛ ØØØÙØÚØÙ ØØÙØÙÙ Tor.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="203"/>
@@ -1203,7 +1193,7 @@
     <message>
         <location filename="../gui/log/messagelog.cpp" line="311"/>
         <source>Save Log Messages</source>
-        <translation>ØØÛÚØÙÛ ÚØØÙ ÙÛØÙÙØÛ ØØØ</translation>
+        <translation>ØØÛÚØÙÛ ÚØØÙ ÙÛØÙ ÙØÛ ØØØ</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="323"/>
@@ -1213,12 +1203,12 @@
     <message>
         <location filename="../gui/log/messagelog.cpp" line="376"/>
         <source>Find in Message Log</source>
-        <translation>ØØØØÙ ÚØØÙ ØØ ØØØ ÙÛØÙ</translation>
+        <translation>ØØØØÙ ÚØØÙ ØØ ØØØ ÙÛØÙ</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="377"/>
         <source>Find:</source>
-        <translation>:ÙÛØØÚØØÙ</translation>
+        <translation>ÙÛØØÚØØÙ:</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="383"/>
@@ -1228,7 +1218,7 @@
     <message>
         <location filename="../gui/log/messagelog.cpp" line="384"/>
         <source>Search found 0 matches.</source>
-        <translation>ØØØØÙ 0 ÙØÛØÙ ÙÛØØÚØØ</translation>
+        <translation>ØØØØÙ 0 ÙØÛØÙ ÙÛØØ ÚØØ</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="863"/>
@@ -1253,32 +1243,29 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="885"/>
         <source>Show the help browser</source>
-        <translation>ÚØØ ÙÚØØØ ØØ ØØÙÙÙØ</translation>
+        <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>.ØØ ØØØ ÚÙØ Tor ÙØÙØÙØØ ØÙÛØØØÙØÛ Vidalia</translation>
+        <translation>Vidalia ÙØÙØÙØØ ØÙÛØØØÙØÛ Tor ØØ ØØØ ÚÙØ.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="324"/>
         <source>Cannot write file %1
 
 %2.</source>
-        <translation>.ÙØØØÙÛ ÙÛ ØØØØ
-
- %1%2 ÙÙØØÙ ØØ ÙØÙÙØÙ
-</translation>
+        <translation>ÙÙØØÙ ØØ ÙØÙÙØÙ %2%1 ÙØØØÙÛ ÙÛ ØØØØ.</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>
+        <translation>Vidalia ÙØÙØÙØØ ÙØÙÙØÙ ÙØØØ ØØÙ ØØ ØØØ ÚÙØ.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="314"/>
         <source>Text Files (*.txt)</source>
-        <translation>(*.txt) ÙØÙÙØÙ ÙØÛ ÙØÙÛ</translation>
+        <translation>ÙØÙÙØÙ ÙØÛ (*.txt)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="893"/>
@@ -1293,7 +1280,7 @@
     <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>
+        <translation>ØÙØ ÙÛØØÛØØ ÛÚ ÙØÙ ÙØÙÙØÙ ÙØØØ ÚÙÛØ ØØØÛ ØÛÙÚÙ ØØÙØÙÛØ ÙÛØÙÙØÛ ØØØ ØØ ØØ ÛÚ ÙØÙÙØÙ ØØÛØÙ ÚÙÛØ.</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="567"/>
@@ -1308,7 +1295,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="612"/>
         <source>messages</source>
-        <translation type="unfinished"></translation>
+        <translation>ÙÛØÙ ÙØ</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="631"/>
@@ -1331,12 +1318,12 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="297"/>
         <source>View Tor Network</source>
-        <translation>Tor ÙØØÙØÙ ØØÚÙ</translation>
+        <translation>ÙØØÙØÙ ØØÚÙ Tor</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="515"/>
         <source>Refresh</source>
-        <translation>ØØØØÙØØÙ</translation>
+        <translation>ØØØ ØÙØØÙ</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="537"/>
@@ -1361,32 +1348,32 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="521"/>
         <source>Refresh the list of routers and connections.</source>
-        <translation type="obsolete">ØØØØÙØØÙ ÙÛØØ ØÙÛØØ ÙØ Ù ØØØØÙ ÙØ</translation>
+        <translation>ØØØØÙØØÙ ÙÛØØ ØÙÛØØ ÙØ Ù ØØØØÙ ÙØ.</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="540"/>
         <source>Show network map help.</source>
-        <translation type="obsolete">.ÙÙØÛØ ØØÙÙÙØÛ ÙÙØÙ ØØÚÙ</translation>
+        <translation>ÙÙØÛØ ØØÙÙÙØÛ ÙÙØÙ ØØÚÙ.</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="543"/>
         <source>Show the network map help.</source>
-        <translation type="obsolete">.ÙÙØÛØ ØØÙÙÙØÛ ÙÙØÙ ØØÚÙ</translation>
+        <translation>ÙÙØÛØ ØØÙÙÙØÛ ÙÙØÙ ØØÚÙ.</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="565"/>
         <source>Close the network map.</source>
-        <translation type="obsolete">.ØØØÙ ÙÙØÙ ØØÚÙ</translation>
+        <translation>ØØØÙ ÙÙØÙ ØØÚÙ.</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="587"/>
         <source>Zoom in on the network map.</source>
-        <translation type="obsolete">.ØØØÚ ÙÙØÛÛ ÚØØÙ ÙÙØÙ ØØÚÙ</translation>
+        <translation>ØØØÚ ÙÙØÛÛ ÚØØÙ ØØ ÙÙØÙ ØØÚÙ.</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="609"/>
         <source>Zoom out on the network map.</source>
-        <translation type="obsolete">.ÚÙÚÚ ÙÙØÛÛ ÚØØÙ ÙÙØÙ ØØÚÙ</translation>
+        <translation>ÚÙÚÚ ÙÙØÛÛ ÚØØÙ ÙÙØÙ ØØÚÙ.</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="625"/>
@@ -1396,7 +1383,7 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="631"/>
         <source>Zooms to fit all currently displayed circuits.</source>
-        <translation type="obsolete">.ØØØÚØØÚØØÙ ØÙÙ ØØØÛ ÙÙÙ ÙØØØÙØÛ ÙØØÙ ØØØÙ ØØÙ ÚÙÙÙÛ</translation>
+        <translation>ØØØÚØØ ÚØØÙ ØÙÙ ØØØÛ ÙÙÙ ÙØØØÙØÛ ÙØØÙ ØØØÙ ØØÙ ÚÙÙÙÛ.</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="529"/>
@@ -1411,7 +1398,7 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="573"/>
         <source>Esc</source>
-        <translation>Esc ÚÙÛØ ÚØÛØ</translation>
+        <translation>ÚÙÛØ ÚØÛØ Esc</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="595"/>
@@ -1428,41 +1415,6 @@
         <source>Ctrl+Z</source>
         <translation>Ctrl+Z</translation>
     </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="521"/>
-        <source>Refresh the list of routers and connections</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="540"/>
-        <source>Show network map help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="543"/>
-        <source>Show the network map help</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="565"/>
-        <source>Close the network map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="587"/>
-        <source>Zoom in on the network map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="609"/>
-        <source>Zoom out on the network map</source>
-        <translation type="unfinished"></translation>
-    </message>
-    <message>
-        <location filename="../gui/network/netviewer.ui" line="631"/>
-        <source>Zooms to fit all currently displayed circuits</source>
-        <translation type="unfinished"></translation>
-    </message>
 </context>
 <context>
     <name>Policy</name>
@@ -1474,7 +1426,7 @@
     <message>
         <location filename="../config/policy.cpp" line="178"/>
         <source>reject</source>
-        <translation>ØØÚØØÙ</translation>
+        <translation>ØØ ÚØØÙ</translation>
     </message>
 </context>
 <context>
@@ -1482,12 +1434,12 @@
     <message>
         <location filename="../control/routerdescriptor.cpp" line="87"/>
         <source>Online</source>
-        <translation>(ØØØØ (ØÙÙØÛÙ</translation>
+        <translation>ØØØØ</translation>
     </message>
     <message>
         <location filename="../control/routerdescriptor.cpp" line="89"/>
         <source>Hibernating</source>
-        <translation>????</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../control/routerdescriptor.cpp" line="91"/>
@@ -1500,32 +1452,32 @@
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
         <source>IP Address:</source>
-        <translation>:(IP) ÙØØÙÛ ØÛÙØØÙØÛ</translation>
+        <translation>ÙØØÙÛ ØÛÙØØÙØÛ</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
         <source>Platform:</source>
-        <translation>:ÙÙØ ÙØÙ</translation>
+        <translation>ÙÙØ ÙØÙ:</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
         <source>Bandwidth:</source>
-        <translation>:ÙÙÙØÛ ØØÙØ</translation>
+        <translation>ÙÙÙØÛ ØØÙØ:</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
         <source>Uptime:</source>
-        <translation>:ØÙØÙ ØØÛØ ØÙØÙ</translation>
+        <translation>ØÙØÙ ØØÛØ ØÙØÙ:</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
         <source>Last Updated:</source>
-        <translation>:ÙØÙØÛÙ ØØÙØØØØÙÛ</translation>
+        <translation>ÙØÙØÛÙ ØØÙØØØØÙÛ:</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
         <source>Location:</source>
-        <translation>:ÙØÙ</translation>
+        <translation>ÙØÙ:</translation>
     </message>
 </context>
 <context>
@@ -1533,7 +1485,7 @@
     <message>
         <location filename="../gui/network/routerlistitem.cpp" line="87"/>
         <source>%1 KB/s</source>
-        <translation>%1 ÚÛÙÙØØÛØ ØØ ØØÙÛÙ</translation>
+        <translation>%1 ÚÛÙÙØØÛØ</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistitem.cpp" line="71"/>
@@ -1543,7 +1495,7 @@
     <message>
         <location filename="../gui/network/routerlistitem.cpp" line="75"/>
         <source>Hibernating</source>
-        <translation>???</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1561,12 +1513,12 @@
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="215"/>
         <source>%1 servers total</source>
-        <translation>ØØÚÙ %1 ØØÙÛØ ØÙÙØÙ</translation>
+        <translation>ØØ ÚÙ %1 ØØÙÛØ ØÙÙØÙ</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="51"/>
         <source>Zoom to Server</source>
-        <translation>???</translation>
+        <translation type="unfinished"></translation>
     </message>
 </context>
 <context>
@@ -1574,17 +1526,17 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="502"/>
         <source>Check to run as a Tor network server</source>
-        <translation>ØØÙÙØÙ ÛÚ ØØÙÛØ ØÙÙØÙ ØØÚÙ Tor ØÛÚ ØØÙÛØ ØØØÛ ØØØØÚØØÙ</translation>
+        <translation>ØÛÚ ØØÙÛØ ØØØÛ ØØØØ ÚØØÙ Tor ØØÙÙØÙ ÛÚ ØØÙÛØ ØÙÙØÙ ØØÚÙ</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="505"/>
         <source>Relay traffic for the Tor network</source>
-        <translation>Tor ØØØÙØØ ÚØØÙ ØØØÙØ ØØØÛ ØØÚÙ</translation>
+        <translation>ØØØ ÙØØ ÚØØÙ ØØØÙØ ØØØÛ ØØÚÙ Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="716"/>
         <source>Directory Port:</source>
-        <translation>:ØØÚØÙ ÙÙØØØ ØØÙÙÙØ</translation>
+        <translation>ØØÚØÙ ÙÙØØØ ØØÙÙÙØ:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="746"/>
@@ -1594,7 +1546,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="616"/>
         <source>Nickname:</source>
-        <translation>:ÙÙØ</translation>
+        <translation>ÙÙØ:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="821"/>
@@ -1604,12 +1556,12 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="684"/>
         <source>Contact Info:</source>
-        <translation>:ØØÙØØØØ ØÙØØ</translation>
+        <translation>ØØÙØØØØ ØÙØØ:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="638"/>
         <source>Server Port:</source>
-        <translation>:ØØÚØÙ ØØÙÛØ ØÙÙØÙ</translation>
+        <translation>ØØÚØÙ ØØÙÛØ ØÙÙØÙ:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="674"/>
@@ -1619,7 +1571,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="565"/>
         <source>Address:</source>
-        <translation>:ÙØØÙÛ</translation>
+        <translation>ÙØØÙÛ:</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="781"/>
@@ -1649,7 +1601,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="1191"/>
         <source>Exit Policies</source>
-        <translation>ØÛØØØÙØ Ù ØØØØØØÚÛ ØØÙØ</translation>
+        <translation>ØÛØØØ ÙØ Ù ØØØØØØÚÛ ØØÙØ</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1317"/>
@@ -1659,7 +1611,7 @@
     <message>
         <location filename="../gui/config/serverpage.cpp" line="148"/>
         <source>You must specify at least a server nickname and port.</source>
-        <translation>.ØÙØ ÙÛ ØØÛØØ ØØØ ÚÙ ÛÚ ÙÙØ Ù ÛÚ ØØÚØÙ ØØÙÛØ ØÙÙØÙ ØØ ÙØØØ ÚÙÛØ</translation>
+        <translation>ØÙØ ÙÛ ØØÛØØ ØØØ ÚÙ ÛÚ ÙÙØ Ù ÛÚ ØØÚØÙ ØØÙÛØ ØÙÙØÙ ØØ ÙØØØ ÚÙÛØ.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="232"/>
@@ -1669,36 +1621,36 @@
     <message>
         <location filename="../gui/config/serverpage.cpp" line="233"/>
         <source>Vidalia was unable to determine your public IP address.</source>
-        <translation>.ÙØÙØÙØØ ÙØØÙÛ ØÛÙØØÙØÛ ÙÙÚØÙÛ ØÙØ ØØ ØØÛÛÙ ÚÙØ Vidalia</translation>
+        <translation>Vidalia ÙØÙØÙØØ ØØØØ ØÛÙØØÙØÛ ÙÙÚØÙÛ ØÙØ ØØ ØØÛÛÙ ÚÙØ.</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</translation>
+        <translation>Vidalia ØÙÙØ ØÙØÙØØ ÙØØÙÛ ØÛÙØØÙØÛ ØØÙØÛ ØÙØ ØØ ÙÛØØ ÚÙØ. ØÛØ ÙÛ ØÙØÙÛØ ØØØÛ ØØÛÛÙ ÚØØÙ ÙØØÙÛ ØÛÙØØÙØÛ ÙÙÚØÙÛ ØÙØ ØÙ ÛÚ ØØÙÛØ ØÛØÙÙÛ ØØØÛØØÛ ÙÛØØÚÙÛØØ</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 ØÚÙØÙÚÙ ÙØØÙ ØØØØ</translation>
+        <translation>ÚÙØÙÚÙ ÙØØÙ ØØØØØ Vidalia ÙØØÙÛ ØÛÙØØÙØÛ ØÙØ ØØ ØÚØ ÙÛØØ ØØØØ ØÙ ÚÙÙÙ ØÙØÙ ØÛ ØØÙØ ØØØÙÛ ØÙØÙØ ÚØØ</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="853"/>
         <source>Automatically Update</source>
-        <translation>ØØÙØ ØØØÙÛ ÚØØÙ ØÚÙÙÙ ØÙØÚØØ</translation>
+        <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>
-        <translation>.ØØ ØØ ÙÛÙØØ ØÚØØØÛØ GPG ÛØ PGP ÙØØÙÛ ÙØØ ØÙÚØØÙÙÛÚÛ ÚÙ ØØÙØÙ ØØ ØÙØ ØØ ØÙØØ ØØÙØ ÙØÚÙ ØØ ØØÙÛØ ØÙÙØÙ ØØÙ ØÙØØ ÚØÙØ. ØÙØ ÙÙÚÙÛÙ ÙÛ ØÙØÙÛØ ØØØØÙÚØØ </translation>
+        <translation>ÙØØÙÛ ÙØØ ØÙÚØØÙÙÛÚÛ ÚÙ ØØÙØÙ ØØ ØÙØ ØØ ØÙØØ ØØÙØ ÙØÚÙ ØØ ØØÙÛØ ØÙÙØÙ ØØÙ ØÙØØ ÚØÙØ. ØÙØ ÙÙÚÙÛÙ ÙÛ ØÙØÙÛØ ØØØ ØÙÚØØ PGP ÛØ GPG ØØ ØØ ÙÛÙØØ ØÚØØØÛØ.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1072"/>
         <source>Long-term average bandwidth limit</source>
-        <translation>???</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1085"/>
@@ -1708,7 +1660,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="1145"/>
         <source>KB/s</source>
-        <translation type="unfinished"></translation>
+        <translation>ÚÛÙÙØØÛØ ØØ ØØÙÛÙ</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1132"/>
@@ -1738,7 +1690,7 @@
     <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>
+        <translation>ØØØÛ ØØØØÙ ÙØÛ ØÛÙØØÙØ ØØ ØØØØ ØØØÚÛØÛ ØØÙØ Ù ØØØÚØØØÛ ÚÙØØ ØÙØÙØÙÙØ ØØØ ØØØØ ØØØÚØØØÛ ØÙØ ØØ ØØ ØÛÙØØ ÙØØØ ÚÙÛØ.</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="943"/>
@@ -1793,7 +1745,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="1245"/>
         <source>Retrieve Mail (POP, IMAP)</source>
-        <translation>(POP, IMAP) ØØØÛØØÛ ÙØÙÙ</translation>
+        <translation>ØØØÛØØÛ ÙØÙÙ (POP, IMAP)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1255"/>
@@ -1803,7 +1755,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="1258"/>
         <source>Misc Other Services</source>
-        <translation>???</translation>
+        <translation type="unfinished"></translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1268"/>
@@ -1823,7 +1775,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="1284"/>
         <source>Secure Websites (SSL)</source>
-        <translation>(SSL) ÙØ ÚØÙ ÙØÛ ØÙÙ</translation>
+        <translation>ÙØ ÚØÙ ÙØÛ ØÙÙ (SSL)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1294"/>
@@ -1838,7 +1790,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="1390"/>
         <source>What Internet resources should Tor users be able to access from your Tor relay?</source>
-        <translation type="unfinished"></translation>
+        <translation>ØÙ ÚÙ ÙÙØØØ ØÛÙØØÙØÛ ÚØØØØØÙ Tor ÙÛØÙØÙÙØ ØØØØ ØØØÙØØ ØÙØ ØØØØØÛ ÙÛØØ ÚÙÙØØ</translation>
     </message>
 </context>
 <context>
@@ -1871,7 +1823,7 @@
     <message>
         <location filename="../control/stream.cpp" line="116"/>
         <source>Closed</source>
-        <translation>ØØØÙ</translation>
+        <translation>ØØØÙ</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="118"/>
@@ -1889,25 +1841,25 @@
     <message>
         <location filename="../control/torprocess.cpp" line="88"/>
         <source>Process %1 failed to stop. [%2]</source>
-        <translation>[%2] .%1 ÙØÚØÙÛ ØØ ØÛØØØØÙ ÙØØÛÙØ</translation>
+        <translation>ÙØÚØÙÛ ØØ ØÛØØØØÙ ÙØØÛÙØ %1. [%2]</translation>
     </message>
 </context>
 <context>
     <name>TorService</name>
     <message>
-        <location filename="../control/torservice.cpp" line="159"/>
+        <location filename="../control/torservice.cpp" line="109"/>
         <source>Services not supported on this platform.</source>
-        <translation>.ØØÙÛØ ÙØ ØØ ØÛÙ ÙÙØ ÙØÙ ÙØØÛØØÙÛ ÙÙÛ ØÙÙØ</translation>
+        <translation>ØØÙÛØ ÙØ ØØ ØÛÙ ÙÙØ ÙØÙ ÙØØÛØØÙÛ ÙÙÛ ØÙÙØ.</translation>
     </message>
     <message>
-        <location filename="../control/torservice.cpp" line="186"/>
+        <location filename="../control/torservice.cpp" line="134"/>
         <source>Unable to start Tor service.</source>
-        <translation>.ÙØØØÙÛ ÙÛ ØØØØ Tor ØØØØ ØØÙÛØ</translation>
+        <translation>ØØØØ ØØÙÛØ Tor ÙØØØÙÛ ÙÛ ØØØØ.</translation>
     </message>
     <message>
-        <location filename="../control/torservice.cpp" line="163"/>
+        <location filename="../control/torservice.cpp" line="113"/>
         <source>The Tor service is not installed.</source>
-        <translation>.ÚØØÚØØØÛ ÙØØÙ ØØØ Tor ØØÙÛØ</translation>
+        <translation>ØØÙÛØ Tor ÚØØÚØØØÛ ÙØØÙ ØØØ.</translation>
     </message>
 </context>
 <context>
@@ -1958,24 +1910,24 @@
     <message>
         <location filename="../vidalia.cpp" line="172"/>
         <source>Invalid language code specified: </source>
-        <translation>:ÚØ ØØØÙ ÙØØØ ØØÙ ÙØØØØØ ÙÛØØØØ</translation>
+        <translation>ÚØ ØØØÙ ÙØØØ ØØÙ ÙØØØØØ ÙÛØØØØ: </translation>
     </message>
     <message>
         <location filename="../vidalia.cpp" line="179"/>
         <source>Invalid GUI style specified: </source>
-        <translation>:ØØÚ ÙØØØ ÙØØØ ØØÙ ÙØÙØØØØ ÙÛØØØØ</translation>
+        <translation>ØØÚ ÙØØØ ÙØØØ ØØÙ ÙØÙØØØØ ÙÛØØØØ: </translation>
     </message>
     <message>
         <location filename="../main.cpp" line="78"/>
         <source>Vidalia is already running</source>
-        <translation>ÙÛØØØ ØØ ØØÙ ØØØØ ÙÛØØØØ Vidalia</translation>
+        <translation>Vidalia ÙÛØØØ ØØ ØØÙ ØØØØ ÙÛØØØØ</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="83"/>
         <source>Another Vidalia process is already running. 
 
 This Vidalia process will now exit.</source>
-        <translation>.ØØØØ ÙÛØÙØ Vidalia ØÛÚØÛ ÙÛØØØ ØØ ØØÙ ØØØØ ÙÛØØØØ. ØÛÙ ÙØØÛÙØ Vidalia ÙØØÛÙØ</translation>
+        <translation>ÙØØÛÙØ Vidalia ØÛÚØÛ ÙÛØØØ ØØ ØØÙ ØØØØ ÙÛØØØØ. ØÛÙ ÙØØÛÙØ Vidalia ØØØØ ÙÛØÙØ.</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="90"/>