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

[vidalia-svn] r1479: Put omg's simplified chinese translation of the gui and the (in trunk: pkg/win32 src/lang)



Author: djhasis
Date: 2006-11-30 06:41:18 -0500 (Thu, 30 Nov 2006)
New Revision: 1479

Added:
   trunk/pkg/win32/vidalia_zh-cn.nsh
Modified:
   trunk/src/lang/vidalia_zh-cn.ts
Log:
Put omg's simplified chinese translation of the gui and the installer

Added: trunk/pkg/win32/vidalia_zh-cn.nsh
===================================================================
--- trunk/pkg/win32/vidalia_zh-cn.nsh	                        (rev 0)
+++ trunk/pkg/win32/vidalia_zh-cn.nsh	2006-11-30 11:41:18 UTC (rev 1479)
@@ -0,0 +1,72 @@
+;; $Id: $
+;; 
+;; Vidalia installer and bundle English translation
+;; 
+;; All translations should be derived from this file.
+;;
+;; To translate this file:
+;;   
+;;    1) Copy this file (vidalia_en.nsh), creating a new file with "en"
+;;       replaced by the two-letter language code of your translated language.
+;;       For example, if you are creating a German translation, your new file
+;;       would be named "vidalia_de.nsh".
+;;
+;;    2) Replace all ${LANG_ENGLISH} tags with whatever language you are
+;;       translating this file into. For example, if you are creating a German
+;;       translation, all ${LANG_ENGLISH} tags would become ${LANG_GERMAN}.
+;;
+;;    3) Translate the quoted strings. You can move string replacement tags
+;;       (e.g., ${BUNDLE_NAME}) around within the quoted strings, but you 
+;;       should not alter the tags themselves.
+;;
+;; Your resulting file should use a non-Unicode character encoding, since NSIS 
+;; does not support Unicode.
+;; 
+
+
+; Bundle
+LangString BundleSetupCaption         ${LANG_CHINESE} "°²× ${BUNDLE_NAME}"
+LangString BundleWelcomeText          ${LANG_CHINESE} "±¾Ïò«Öµ¼ÄãÈçºÎ²× Tor¡¢Vidalia¡¢Privoxy ºÍ Torbutton¡£\r\n\r\nÈç¹ûÄãÔø×¹ý Tor¡¢Vidalia »ò Firefox£¬ÔÚÌÐø°²×ÇÇëȱ£ËüÃÇÃÓÐÔËÐУ\r\n\r\n$_CLICK"
+LangString BundleWelcomeTitle         ${LANG_CHINESE} "»¶ÓÀµ½ ${BUNDLE_NAME} °²×Ïòµ¼"
+LangString BundleLinkText             ${LANG_CHINESE} "${TOR_NAME} °²×Îĵ"
+LangString BundleFinishText           ${LANG_CHINESE} "°²×ÒÑ­½áÊø¡£r\nÇë·ÃÎÊ http://tor.eff.org/docs/tor-doc-win32.html ÑÏÈçºÎÅäÖÃÄãµÄÓÓÃÌÐòÊÓà Tor¡£\r\n\r\nÈç¹û°²×ÁË Torbutton£¬ÄãÐèÒÖØÐÂÆô¶¯ Firefox¡£"
+LangString BundleRunNow               ${LANG_CHINESE} "Á¿ÌÔËÐв׵Ŀ¼þ"
+
+; Vidalia
+LangString VidaliaGroupDesc           ${LANG_CHINESE} "°²× ${VIDALIA_DESC}¡£"
+LangString VidaliaSetupCaption        ${LANG_CHINESE} "°²× ${VIDALIA_NAME}"
+LangString VidaliaWelcomeText         ${LANG_CHINESE} "±¾Ïò«Öµ¼ÄãÈçºÎ²× ${VIDALIA_DESC}¡£\r\n\r\n$_CLICK"
+LangString VidaliaWelcomeTitle        ${LANG_CHINESE} "»¶ÓÀµ½ ${VIDALIA_NAME} °²×Ïòµ¼"
+LangString VidaliaLinkText            ${LANG_CHINESE} "${VIDALIA_NAME} Ö÷Ò"
+LangString VidaliaAppDesc             ${LANG_CHINESE} "°²× ${VIDALIA_DESC}¡£"
+LangString VidaliaStartup             ${LANG_CHINESE} "Æô¶¯ÊÔËÐÐ"
+LangString VidaliaStartupDesc         ${LANG_CHINESE} "ÏÍÆô¶¯Ê×Ô¯ÔËÐÐ ${VIDALIA_NAME}¡£"
+LangString VidaliaShortcuts           ${LANG_CHINESE} "Ìí¼Ó½¿ªÊ²Ë¥"
+LangString VidaliaShortcutsDesc       ${LANG_CHINESE} "°Ñ ${VIDALIA_NAME} Ìí¼Ó½ÄãµÄªÊ²Ë¥¡£"
+LangString VidaliaRunNow              ${LANG_CHINESE} "Á¿ÌÔËÐÐ ${VIDALIA_NAME}"
+
+; Tor
+LangString TorGroupDesc               ${LANG_CHINESE} "°²× ${TOR_DESC}¡£"
+LangString TorAppDesc                 ${LANG_CHINESE} "°²× ${TOR_DESC}¡£"
+LangString TorAskOverwriteTorrc       ${LANG_CHINESE} "ÄãÒÑÓÐÒ¸ö Tor ÅäÖÃÎÄþ¡£$\r$\nÄãÏëÓÃÈʵÄÊÀýÅäÖÃÎÄþ¸²¸ÇÂð£¿"
+LangString TorOpenSSL                 ${LANG_CHINESE} "OpenSSL ${OPENSSL_APPVERSION}"
+LangString TorOpenSSLDesc             ${LANG_CHINESE} "°²× ${OPENSSL_DESC}¡£"
+LangString TorDocumentation           ${LANG_CHINESE} "뀵"
+LangString TorDocumentationDesc       ${LANG_CHINESE} "°²× ${TOR_NAME} Îĵ¡£"
+LangString TorShortcuts               ${LANG_CHINESE} "Ìí¼Ó½¿ªÊ²Ë¥"
+LangString TorShortcutsDesc           ${LANG_CHINESE} "°Ñ ${TOR_NAME} Ìí¼Ó½ÄãµÄªÊ²Ë¥¡£"
+
+; Privoxy
+LangString PrivoxyGroupDesc           ${LANG_CHINESE} "°²× ${PRIVOXY_DESC}"
+LangString PrivoxyAppDesc             ${LANG_CHINESE} "°²× ${PRIVOXY_DESC}¡£"
+LangString PrivoxyShortcuts           ${LANG_CHINESE} "Ìí¼Ó½¿ªÊ²Ë¥"
+LangString PrivoxyShortcutsDesc       ${LANG_CHINESE} "°Ñ ${PRIVOXY_NAME} Ìí¼Ó½ÄãµÄªÊ²Ë¥¡£"
+LangString PrivoxyStartup             ${LANG_CHINESE} "Æô¶¯ÊÔËÐÐ"
+LangString PrivoxyStartupDesc         ${LANG_CHINESE} "ÏÍÆô¶¯Ê×Ô¯ÔËÐÐ ${PRIVOXY_NAME}¡£"
+
+; Torbutton
+LangString TorbuttonGroupDesc         ${LANG_CHINESE} "°²× ${TORBUTTON_DESC}¡£"
+LangString TorbuttonAppDesc           ${LANG_CHINESE} "°²× ${TORBUTTON_DESC}¡£"
+LangString TorbuttonAddToFirefox      ${LANG_CHINESE} "Ìí¼Ó½ Firefox"
+LangString TorbuttonAddToFirefoxDesc  ${LANG_CHINESE} "°Ñ ${TORBUTTON_DESC} ÀÕÌí¼Ó½ Firefox¡£"
+LangString TorbuttonFirefoxNotFound   ${LANG_CHINESE} "ÄãµÄÏÍÖÐÃÓÐÕÒ½ Firefox£¬Torbutton ½«²»°²×¡£"

Modified: trunk/src/lang/vidalia_zh-cn.ts
===================================================================
--- trunk/src/lang/vidalia_zh-cn.ts	2006-11-30 06:08:17 UTC (rev 1478)
+++ trunk/src/lang/vidalia_zh-cn.ts	2006-11-30 11:41:18 UTC (rev 1479)
@@ -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"/>
@@ -53,7 +53,7 @@
     <message>
         <location filename="../gui/about/aboutdialog.cpp" line="75"/>
         <source>&lt;Unavailable&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;äåç&gt;</translation>
     </message>
 </context>
 <context>
@@ -71,12 +71,12 @@
     <message>
         <location filename="../gui/config/advancedpage.ui" line="390"/>
         <source>Start Tor with the specified configuration file (torrc)</source>
-        <translation>æåTorååæçéçæä(torrc)</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"/>
@@ -96,7 +96,7 @@
     <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"/>
@@ -106,79 +106,81 @@
     <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"/>
         <source>File Not Found</source>
-        <translation type="unfinished"></translation>
+        <translation>æäææå</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="122"/>
         <source>%1 does not exist. Would you like to create it?</source>
-        <translation type="unfinished"></translation>
+        <translation>%1 äååãäåæçååååï</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="133"/>
         <source>Failed to Create File</source>
-        <translation type="unfinished"></translation>
+        <translation>ååæäåè</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="134"/>
         <source>Unable to create %1 [%2]</source>
-        <translation type="unfinished"></translation>
+        <translation>ææåå %1 [%2]</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="515"/>
         <source>Service</source>
-        <translation type="unfinished"></translation>
+        <translation>æå</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="530"/>
         <source>Enable this if you wish to run Tor as a Windows service</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>åååää Windows çääæåèè Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="157"/>
         <source>Unable to remove Tor Service</source>
-        <translation type="unfinished"></translation>
+        <translation>ææåæ Tor æå</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.cpp" line="168"/>
         <source>Unable to install Tor Service</source>
-        <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
+        <translation>Vidalia ææåæ Tor æåã
+
+äéèæååæäã</translation>
     </message>
     <message>
         <location filename="../gui/config/advancedpage.ui" line="369"/>
         <source>Tor Configuration File</source>
-        <translation type="unfinished"></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 +193,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 +208,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,7 +216,7 @@
     <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"/>
@@ -264,7 +266,7 @@
     <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"/>
@@ -274,7 +276,7 @@
     <message>
         <location filename="../gui/bwgraph/bwgraph.ui" line="474"/>
         <source>Always On Top</source>
-        <translation type="unfinished"></translation>
+        <translation>æååç</translation>
     </message>
 </context>
 <context>
@@ -282,32 +284,32 @@
     <message>
         <location filename="../control/circuit.cpp" line="109"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>æå</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="110"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>åæ</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="111"/>
         <source>Building</source>
-        <translation type="unfinished"></translation>
+        <translation>åçä</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="112"/>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>åè</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="113"/>
         <source>Closed</source>
-        <translation type="unfinished"></translation>
+        <translation>åé</translation>
     </message>
     <message>
         <location filename="../control/circuit.cpp" line="114"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translationæç></translation>
     </message>
 </context>
 <context>
@@ -315,7 +317,7 @@
     <message>
         <location filename="../gui/network/circuititem.cpp" line="49"/>
         <source>&lt;Path Empty&gt;</source>
-        <translation type="unfinished"></translation>
+        <translation>&lt;èåçç&gt;</translation>
     </message>
 </context>
 <context>
@@ -323,22 +325,22 @@
     <message>
         <location filename="../gui/network/circuitlistwidget.cpp" line="46"/>
         <source>Connection</source>
-        <translation type="unfinished"></translation>
+        <translation>èæ</translation>
     </message>
     <message>
         <location filename="../gui/network/circuitlistwidget.cpp" line="46"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>çæ</translation>
     </message>
     <message>
         <location filename="../gui/network/circuitlistwidget.cpp" line="54"/>
         <source>Close Circuit</source>
-        <translation type="unfinished"></translation>
+        <translation>åéèæ</translation>
     </message>
     <message>
         <location filename="../gui/network/circuitlistwidget.cpp" line="58"/>
         <source>Close Stream</source>
-        <translation type="unfinished"></translation>
+        <translation>åéäæ</translation>
     </message>
 </context>
 <context>
@@ -386,7 +388,7 @@
     <message>
         <location filename="../gui/config/configdialog.ui" line="289"/>
         <source>Settings</source>
-        <translation type="unfinished">èç</translation>
+        <translation>èç</translation>
     </message>
 </context>
 <context>
@@ -394,12 +396,12 @@
     <message>
         <location filename="../control/controlconnection.cpp" line="285"/>
         <source>Control socket is not connected.</source>
-        <translation type="unfinished"></translation>
+        <translation>æååæåææèæã</translation>
     </message>
     <message>
         <location filename="../control/controlconnection.cpp" line="232"/>
         <source>Control socket is not connected</source>
-        <translation type="unfinished"></translation>
+        <translation>æååæåææèæ</translation>
     </message>
 </context>
 <context>
@@ -407,23 +409,24 @@
     <message>
         <location filename="../control/controlsocket.cpp" line="61"/>
         <source>Error connecting to %1:%2 [%3]</source>
-        <translation>èæå%1:%2 [%3]æåé</translation>
+        <translation>èæå %1:%2 æåçäéè [%3]</translation>
     </message>
     <message>
         <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>
+        <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="145"/>
         <source>Error sending control command. [%1]</source>
-        <translation>åéæååäæåéï[%1]</translation>
+        <translation>åéæååäæåéã[%1]</translation>
     </message>
     <message>
         <location filename="../control/controlsocket.cpp" line="182"/>
@@ -433,12 +436,12 @@
     <message>
         <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="136"/>
         <source>Control socket is not connected.</source>
-        <translation type="unfinished"></translation>
+        <translation>æååæåææèæã</translation>
     </message>
 </context>
 <context>
@@ -446,12 +449,12 @@
     <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"/>
@@ -466,37 +469,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>èäåå Vidalia æèè Tor</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.ui" line="409"/>
         <source>Start Tor when Vidalia starts</source>
-        <translation>èèVidaliaæååTor</translation>
+        <translation>åå Vidalia æåå Tor</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 type="unfinished"></translation>
+        <translation>Tor çå</translation>
     </message>
     <message>
         <location filename="../gui/config/generalpage.cpp" line="63"/>
         <source>Executables (*.exe)</source>
-        <translation type="unfinished"></translation>
+        <translation>çå (*.exe)</translation>
     </message>
 </context>
 <context>
@@ -537,7 +540,7 @@
     <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"/>
@@ -582,7 +585,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"/>
@@ -597,7 +600,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"/>
@@ -607,12 +610,12 @@
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="797"/>
         <source>Home</source>
-        <translation>éé</translation>
+        <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>
+        <translation>çåäéé (Ctrl+H)</translation>
     </message>
     <message>
         <location filename="../gui/help/browser/helpbrowser.ui" line="808"/>
@@ -627,7 +630,7 @@
     <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"/>
@@ -642,7 +645,7 @@
     <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"/>
@@ -687,12 +690,12 @@
     <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"/>
         <source>Found %1 results</source>
-        <translation>ææå%1äçæ</translation>
+        <translation>æå %1 äçæ</translation>
     </message>
 </context>
 <context>
@@ -708,32 +711,32 @@
     <message>
         <location filename="../control/logevent.cpp" line="68"/>
         <source>Debug</source>
-        <translation type="unfinished">Debug</translation>
+        <translation>èè</translation>
     </message>
     <message>
         <location filename="../control/logevent.cpp" line="69"/>
         <source>Info</source>
-        <translation type="unfinished">äæ</translation>
+        <translation>äæ</translation>
     </message>
     <message>
         <location filename="../control/logevent.cpp" line="70"/>
         <source>Notice</source>
-        <translation type="unfinished">ææ</translation>
+        <translation>ææ</translation>
     </message>
     <message>
         <location filename="../control/logevent.cpp" line="71"/>
         <source>Warning</source>
-        <translation type="unfinished">èå</translation>
+        <translation>èå</translation>
     </message>
     <message>
         <location filename="../control/logevent.cpp" line="72"/>
         <source>Error</source>
-        <translation type="unfinished">åé</translation>
+        <translation>éè</translation>
     </message>
     <message>
         <location filename="../control/logevent.cpp" line="73"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>æç</translation>
     </message>
 </context>
 <context>
@@ -741,12 +744,12 @@
     <message>
         <location filename="../gui/log/logtreewidget.cpp" line="40"/>
         <source>Messages Shown: </source>
-        <translation type="unfinished">æççææï</translation>
+        <translation>æççææï</translation>
     </message>
     <message>
         <location filename="../gui/log/logtreewidget.cpp" line="230"/>
         <source>Messages Shown: %1</source>
-        <translation type="unfinished">æççææï%1</translation>
+        <translation>æççææï%1</translation>
     </message>
 </context>
 <context>
@@ -754,7 +757,7 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="239"/>
         <source>Tor is Stopped</source>
-        <translation type="unfinished">Torååæ</translation>
+        <translation>Tor ååæ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="194"/>
@@ -834,47 +837,47 @@
     <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 type="unfinished">Torååæ</translation>
+        <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>VidaliaææåæTorã</translation>
+        <translation>Vidalia ææåæ Torã</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="394"/>
         <source>Tor is starting</source>
-        <translation type="unfinished">Toræååå</translation>
+        <translation>Tor æååå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="529"/>
         <source>Tor is running</source>
-        <translation type="unfinished">Toræåèè</translation>
+        <translation>Tor æåèè</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="435"/>
@@ -884,71 +887,75 @@
     <message>
         <location filename="../gui/mainwindow.cpp" line="471"/>
         <source>Tor is stopping</source>
-        <translation type="unfinished">Toræååæ</translation>
+        <translation>Tor æååæ</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="289"/>
         <source>Ctrl+N</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+N</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="537"/>
         <source>Error Applying Server Settings</source>
-        <translation type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></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 type="unfinished"></translation>
+        <translation>Vidalia ææåå Torãèææäçèçïçä Tor çåçåçåäçæèã</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="213"/>
         <source>Network Map</source>
-        <translation type="unfinished"></translation>
+        <translation>ççåå</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="217"/>
         <source>Settings</source>
-        <translation type="unfinished">èç</translation>
+        <translation>èç</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="571"/>
         <source>New Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>æåèä</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="291"/>
         <source>Ctrl+I</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+I</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="574"/>
         <source>All subsequent connections will appear to be different than your old connections.</source>
-        <translation type="unfinished"></translation>
+        <translation>äåææèæåäåäååçèæã</translation>
     </message>
     <message>
         <location filename="../gui/mainwindow.cpp" line="587"/>
         <source>Failed to Create New Identity</source>
-        <translation type="unfinished"></translation>
+        <translation>æåèäåè</translation>
     </message>
 </context>
 <context>
@@ -1006,7 +1013,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="487"/>
         <source>Error</source>
-        <translation>åé</translation>
+        <translation>éè</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="503"/>
@@ -1026,7 +1033,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="551"/>
         <source>Debug</source>
-        <translation>Debug</translation>
+        <translation>èè</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="727"/>
@@ -1046,7 +1053,7 @@
     <message>
         <location filename="../gui/log/messagelog.ui" line="746"/>
         <source>Set maximum number of messages to display</source>
-        <translation>åæçèçææåæææ</translation>
+        <translation>èçæççæåææäæ</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="762"/>
@@ -1136,7 +1143,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"/>
@@ -1147,13 +1154,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"/>
@@ -1161,20 +1168,19 @@
 during normal Tor operation and are 
 not considered errors, but you may 
 care about.</source>
-        <translation>æåToræäèçäèååççææï
-<byte value="x9"/><byte value="x9"/>èçäæåéææïäæåèèææææã</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"/>
@@ -1219,7 +1225,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"/>
@@ -1249,71 +1255,71 @@
     <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>
+        <translation>Vidalia æææå Tor çæåääã</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="324"/>
         <source>Cannot write file %1
 
 %2.</source>
-        <translation>ææååæä%1
-<byte value="x9"/><byte value="x9"/>
+        <translation>ææååæä %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 type="unfinished"></translation>
+        <translation>Vidalia æææåæåæäã</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="314"/>
         <source>Text Files (*.txt)</source>
-        <translation type="unfinished"></translation>
+        <translation>ææ (*.txt)</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="893"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.cpp" line="241"/>
         <source>Log Filename Required</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>äåéèåääæäåääåæåã</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="567"/>
         <source>Message Log History</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>æææåçåæççæææé</translation>
     </message>
     <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"/>
         <source>Always Save New Log Messages</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>åèèåææææçæææåäååääæä</translation>
     </message>
     <message>
         <location filename="../gui/log/messagelog.ui" line="672"/>
         <source>Automatically save new log messages to a file</source>
-        <translation type="unfinished"></translation>
+        <translation>èåäåææææååääæä</translation>
     </message>
 </context>
 <context>
@@ -1321,102 +1327,102 @@
     <message>
         <location filename="../gui/network/netviewer.ui" line="297"/>
         <source>View Tor Network</source>
-        <translation type="unfinished"></translation>
+        <translation>æç Tor çç</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="515"/>
         <source>Refresh</source>
-        <translation type="unfinished"></translation>
+        <translation>åæ</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="537"/>
         <source>Help</source>
-        <translation type="unfinished">åå</translation>
+        <translation>åå</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="559"/>
         <source>Close</source>
-        <translation type="unfinished">åé</translation>
+        <translation>åé</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="581"/>
         <source>Zoom In</source>
-        <translation type="unfinished"></translation>
+        <translation>æå</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="603"/>
         <source>Zoom Out</source>
-        <translation type="unfinished"></translation>
+        <translation>çå</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="521"/>
         <source>Refresh the list of routers and connections.</source>
-        <translation type="unfinished"></translation>
+        <translation>åæèçååèæçåèã</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="540"/>
         <source>Show network map help.</source>
-        <translation type="unfinished"></translation>
+        <translation>æçççååçååã</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="543"/>
         <source>Show the network map help.</source>
-        <translation type="unfinished"></translation>
+        <translation>æçççååçååã</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="565"/>
         <source>Close the network map.</source>
-        <translation type="unfinished"></translation>
+        <translation>åéççååã</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="587"/>
         <source>Zoom in on the network map.</source>
-        <translation type="unfinished"></translation>
+        <translation>æåççååã</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="609"/>
         <source>Zoom out on the network map.</source>
-        <translation type="unfinished"></translation>
+        <translation>çåççååã</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="625"/>
         <source>Zoom To Fit</source>
-        <translation type="unfinished"></translation>
+        <translation>æåé</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="631"/>
         <source>Zooms to fit all currently displayed circuits.</source>
-        <translation type="unfinished"></translation>
+        <translation>åççååçæäéåæçååææèæã</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="529"/>
         <source>Ctrl+R</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+R</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="551"/>
         <source>F1</source>
-        <translation type="unfinished"></translation>
+        <translation>F1</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="573"/>
         <source>Esc</source>
-        <translation type="unfinished">Esc</translation>
+        <translation>Esc</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="595"/>
         <source>+</source>
-        <translation type="unfinished"></translation>
+        <translation>+</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="617"/>
         <source>-</source>
-        <translation type="unfinished">-</translation>
+        <translation>-</translation>
     </message>
     <message>
         <location filename="../gui/network/netviewer.ui" line="639"/>
         <source>Ctrl+Z</source>
-        <translation type="unfinished"></translation>
+        <translation>Ctrl+Z</translation>
     </message>
 </context>
 <context>
@@ -1424,12 +1430,12 @@
     <message>
         <location filename="../config/policy.cpp" line="178"/>
         <source>accept</source>
-        <translation type="unfinished">æå</translation>
+        <translation>æå</translation>
     </message>
     <message>
         <location filename="../config/policy.cpp" line="178"/>
         <source>reject</source>
-        <translation type="unfinished">æç</translation>
+        <translation>æç</translation>
     </message>
 </context>
 <context>
@@ -1437,17 +1443,17 @@
     <message>
         <location filename="../control/routerdescriptor.cpp" line="87"/>
         <source>Online</source>
-        <translation type="unfinished"></translation>
+        <translation>åç</translation>
     </message>
     <message>
         <location filename="../control/routerdescriptor.cpp" line="89"/>
         <source>Hibernating</source>
-        <translation type="unfinished"></translation>
+        <translation>äç</translation>
     </message>
     <message>
         <location filename="../control/routerdescriptor.cpp" line="91"/>
         <source>Offline</source>
-        <translation type="unfinished"></translation>
+        <translation>çç</translation>
     </message>
 </context>
 <context>
@@ -1455,32 +1461,32 @@
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="114"/>
         <source>IP Address:</source>
-        <translation type="unfinished">IPååï</translation>
+        <translation>IP ååï</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="115"/>
         <source>Platform:</source>
-        <translation type="unfinished"></translation>
+        <translation>ååï</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="119"/>
         <source>Bandwidth:</source>
-        <translation type="unfinished"></translation>
+        <translation>ååï</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="121"/>
         <source>Uptime:</source>
-        <translation type="unfinished"></translation>
+        <translation>èèæéï</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="127"/>
         <source>Last Updated:</source>
-        <translation type="unfinished"></translation>
+        <translation>æåææï</translation>
     </message>
     <message>
         <location filename="../gui/network/routerdescriptorview.cpp" line="110"/>
         <source>Location:</source>
-        <translation type="unfinished"></translation>
+        <translation>åçï</translation>
     </message>
 </context>
 <context>
@@ -1488,17 +1494,17 @@
     <message>
         <location filename="../gui/network/routerlistitem.cpp" line="87"/>
         <source>%1 KB/s</source>
-        <translation type="unfinished">%1 KB/s</translation>
+        <translation>%1 KB/s</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistitem.cpp" line="71"/>
         <source>Offline</source>
-        <translation type="unfinished"></translation>
+        <translation>çç</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistitem.cpp" line="75"/>
         <source>Hibernating</source>
-        <translation type="unfinished"></translation>
+        <translation>äç</translation>
     </message>
 </context>
 <context>
@@ -1506,22 +1512,22 @@
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="40"/>
         <source>Status</source>
-        <translation type="unfinished"></translation>
+        <translation>çæ</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="40"/>
         <source>Server</source>
-        <translation type="unfinished">æåå</translation>
+        <translation>æåå</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="215"/>
         <source>%1 servers total</source>
-        <translation type="unfinished"></translation>
+        <translation>æå %1 æåå</translation>
     </message>
     <message>
         <location filename="../gui/network/routerlistwidget.cpp" line="51"/>
         <source>Zoom to Server</source>
-        <translation type="unfinished"></translation>
+        <translation>çæåæåå</translation>
     </message>
 </context>
 <context>
@@ -1529,12 +1535,12 @@
     <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"/>
@@ -1554,7 +1560,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="821"/>
         <source>Name of your server</source>
-        <translation>æçæååå</translation>
+        <translation>æååçåå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="684"/>
@@ -1569,7 +1575,7 @@
     <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>
+        <translation>çæååäæååääçæååéäççå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="565"/>
@@ -1579,12 +1585,12 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="781"/>
         <source>Domain name or IP address of your server</source>
-        <translation>æçååæèIPåå</translation>
+        <translation>æååçååæè IP åå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="837"/>
         <source>Enable to mirror the server directory</source>
-        <translation>åçæååçåçéå</translation>
+        <translation>éäéåæååçå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="840"/>
@@ -1594,7 +1600,7 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="590"/>
         <source>Attempts to determine the correct address for your server</source>
-        <translation>åèçåæçæååçåå</translation>
+        <translation>åèçåæååçæçåå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="593"/>
@@ -1604,103 +1610,104 @@
     <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"/>
         <source>Show help topic on exit policies</source>
-        <translation>æçåäéåçççååäé</translation>
+        <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>
+        <translation>äåéèåæåääæååæçåçåã</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.cpp" line="232"/>
         <source>Error</source>
-        <translation>åé</translation>
+        <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>
+        <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>
-        <translation>VidaliaåèæåææååçääçæIPååã
-<byte value="x9"/><byte value="x9"/>
-ææéèåéæåæçåæçååIPåååï</translation>
+        <translation>Vidalia åèæåæååçääçæ IP ååã
+
+äæéèåéæåæçååå 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 type="unfinished"></translation>
+        <translation>éäåïåæåèïVidalia äåæææäç IP åå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="853"/>
         <source>Automatically Update</source>
-        <translation type="unfinished"></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 type="unfinished">ääææåååçééïåæäçEmailèçæå</translation>
+        <translation>åæäçæåååçééïääåäéèèä Email èçäã
+äèåäååäç PGP æ GPG æçã</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1072"/>
         <source>Long-term average bandwidth limit</source>
-        <translation type="unfinished"></translation>
+        <translation>éæååååéå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1085"/>
         <source>Average Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>ååéç</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1145"/>
         <source>KB/s</source>
-        <translation type="unfinished"></translation>
+        <translation>KB/s</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1132"/>
         <source>Peak bandwidth rate limit</source>
-        <translation type="unfinished"></translation>
+        <translation>æéååéçéå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1152"/>
         <source>Maximum Rate</source>
-        <translation type="unfinished"></translation>
+        <translation>æééç</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="989"/>
         <source>Show help topic on bandwidth rate limits</source>
-        <translation type="unfinished"></translation>
+        <translation>æçæåååéçéåçååäé</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="537"/>
         <source>Basic Settings</source>
-        <translation type="unfinished"></translation>
+        <translation>åæèç</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="887"/>
         <source>Bandwidth Limits</source>
-        <translation type="unfinished"></translation>
+        <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 type="unfinished"></translation>
+        <translation>åäææééäèéçåäéäèéçç Internet èæïèåæååäçäèéçã</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="943"/>
         <source>Select the entry that most closely resembles your Internet connection</source>
-        <translation type="unfinished"></translation>
+        <translation>èéæåäç Internet èæææèçäé</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="953"/>
@@ -1730,72 +1737,72 @@
     <message>
         <location filename="../gui/config/serverpage.ui" line="978"/>
         <source>Custom</source>
-        <translation type="unfinished"></translation>
+        <translation>åå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1229"/>
         <source>Ports 6660 - 6669 and 6697</source>
-        <translation type="unfinished"></translation>
+        <translation>çå 6660 - 6669 å 6697</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1232"/>
         <source>Internet Relay Chat (IRC)</source>
-        <translation type="unfinished"></translation>
+        <translation>åçèåçç (IRC)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1242"/>
         <source>Ports 110, 143, 993 and 995</source>
-        <translation type="unfinished"></translation>
+        <translation>çå 110, 143, 993 å 995</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1245"/>
         <source>Retrieve Mail (POP, IMAP)</source>
-        <translation type="unfinished"></translation>
+        <translation>ææéä (POP, IMAP)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1255"/>
         <source>Ports unspecified by other checkboxes</source>
-        <translation type="unfinished"></translation>
+        <translation>åäåéæææåççå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1258"/>
         <source>Misc Other Services</source>
-        <translation type="unfinished"></translation>
+        <translation>åäæå</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1268"/>
         <source>Ports 706, 1863, 5050, 5190, 5222, 8300 and 8888</source>
-        <translation type="unfinished"></translation>
+        <translation>çå 706, 1863, 5050, 5190, 5222, 8300 å 8888</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1271"/>
         <source>Instant Messaging (IM)</source>
-        <translation type="unfinished"></translation>
+        <translation>åæéè (IM)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1281"/>
         <source>Port 443</source>
-        <translation type="unfinished"></translation>
+        <translation>çå 443</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1284"/>
         <source>Secure Websites (SSL)</source>
-        <translation type="unfinished"></translation>
+        <translation>ååççç (SSL)</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1294"/>
         <source>Port 80</source>
-        <translation type="unfinished"></translation>
+        <translation>çå 80</translation>
     </message>
     <message>
         <location filename="../gui/config/serverpage.ui" line="1297"/>
         <source>Websites</source>
-        <translation type="unfinished"></translation>
+        <translation>çç</translation>
     </message>
     <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 çæåäääçæååèæåä Internet èæï</translation>
     </message>
 </context>
 <context>
@@ -1803,42 +1810,42 @@
     <message>
         <location filename="../control/stream.cpp" line="110"/>
         <source>New</source>
-        <translation type="unfinished"></translation>
+        <translation>æå</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="112"/>
         <source>Resolving</source>
-        <translation type="unfinished"></translation>
+        <translation>èæ</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="113"/>
         <source>Connecting</source>
-        <translation type="unfinished"></translation>
+        <translation>èæ</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="114"/>
         <source>Open</source>
-        <translation type="unfinished"></translation>
+        <translation>åæ</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="115"/>
         <source>Failed</source>
-        <translation type="unfinished"></translation>
+        <translation>åè</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="116"/>
         <source>Closed</source>
-        <translation type="unfinished"></translation>
+        <translation>åé</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="118"/>
         <source>Unknown</source>
-        <translation type="unfinished"></translation>
+        <translation>æç</translation>
     </message>
     <message>
         <location filename="../control/stream.cpp" line="117"/>
         <source>Retrying</source>
-        <translation type="unfinished"></translation>
+        <translation>éè</translation>
     </message>
 </context>
 <context>
@@ -1846,7 +1853,7 @@
     <message>
         <location filename="../control/torprocess.cpp" line="88"/>
         <source>Process %1 failed to stop. [%2]</source>
-        <translation>èç %1ææåæï[%2]</translation>
+        <translation>èç %1 ææåæã[%2]</translation>
     </message>
 </context>
 <context>
@@ -1854,17 +1861,17 @@
     <message>
         <location filename="../control/torservice.cpp" line="109"/>
         <source>Services not supported on this platform.</source>
-        <translation type="unfinished"></translation>
+        <translation>èååäæææåã</translation>
     </message>
     <message>
         <location filename="../control/torservice.cpp" line="134"/>
         <source>Unable to start Tor service.</source>
-        <translation type="unfinished"></translation>
+        <translation>ææåå Tor æåã</translation>
     </message>
     <message>
         <location filename="../control/torservice.cpp" line="113"/>
         <source>The Tor service is not installed.</source>
-        <translation type="unfinished"></translation>
+        <translation>Tor æåææåèã</translation>
     </message>
 </context>
 <context>
@@ -1872,42 +1879,42 @@
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="88"/>
         <source>OK</source>
-        <translation type="unfinished">OK</translation>
+        <translation>OK</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="89"/>
         <source>Cancel</source>
-        <translation type="unfinished">åæ</translation>
+        <translation>åæ</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="90"/>
         <source>Yes</source>
-        <translation type="unfinished"></translation>
+        <translation>æ</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="91"/>
         <source>No</source>
-        <translation type="unfinished"></translation>
+        <translation>å</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="92"/>
         <source>Help</source>
-        <translation type="unfinished">åå</translation>
+        <translation>åå</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="93"/>
         <source>Retry</source>
-        <translation type="unfinished">éè</translation>
+        <translation>éè</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="94"/>
         <source>Show Log</source>
-        <translation type="unfinished">æçæå</translation>
+        <translation>æçæå</translation>
     </message>
     <message>
         <location filename="../gui/common/vmessagebox.cpp" line="95"/>
         <source>Show Settings</source>
-        <translation type="unfinished">æçèç</translation>
+        <translation>æçèç</translation>
     </message>
 </context>
 <context>
@@ -1925,14 +1932,16 @@
     <message>
         <location filename="../main.cpp" line="78"/>
         <source>Vidalia is already running</source>
-        <translation type="unfinished"></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 type="unfinished"></translation>
+        <translation>åää Vidalia èçåçèèã
+
+è Vidalia èçåéåã</translation>
     </message>
     <message>
         <location filename="../main.cpp" line="90"/>
@@ -1941,7 +1950,11 @@
 This Vidalia process will now exit. 
 
 (If there really is not another Vidalia process running, you can delete %1 before starting Vidalia again.)</source>
-        <translation type="unfinished"></translation>
+        <translation>åää Vidalia èçåçèèã
+
+è Vidalia èçåéåã
+
+(åæçåææåääæåèèç Vidalia èçïååæåå Vidalia åäåäåé %1ã)</translation>
     </message>
 </context>
 </TS>